[ASTERIXDB-2256] Reformat sources using code format template Change-Id: I4faa141c1a8c9700d5e9ac50b839acc9d1eede73 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2310 Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Contrib: Jenkins <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/cb9ca975 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/cb9ca975 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/cb9ca975 Branch: refs/heads/master Commit: cb9ca97531eddee2cd312654bf13b0905cb3ef6e Parents: e5190b9 Author: Michael Blow <[email protected]> Authored: Sat Jan 27 23:03:30 2018 -0500 Committer: Michael Blow <[email protected]> Committed: Sun Jan 28 12:51:07 2018 -0800 ---------------------------------------------------------------------- .../apache/asterix/active/ActiveManager.java | 17 +- .../asterix/active/DeployedJobService.java | 3 +- .../org/apache/asterix/active/EntityId.java | 4 +- .../physical/BTreeSearchPOperator.java | 4 +- .../operators/physical/CommitPOperator.java | 3 +- .../compiler/provider/IRuleSetFactory.java | 6 +- .../asterix/optimizer/base/AnalysisUtil.java | 3 +- .../AsterixIntroduceGroupByCombinerRule.java | 14 +- .../rules/ByNameToByHandleFieldAccessRule.java | 16 +- .../rules/ByNameToByIndexFieldAccessRule.java | 4 +- .../CancelUnnestWithNestedListifyRule.java | 4 +- .../optimizer/rules/CountVarToCountOneRule.java | 6 +- .../rules/DisjunctivePredicateToJoinRule.java | 10 +- .../rules/FeedScanCollectionToUnnest.java | 6 +- .../rules/FixReplicateOperatorOutputsRule.java | 12 +- .../FullTextContainsParameterCheckRule.java | 1 - .../asterix/optimizer/rules/FuzzyJoinRule.java | 4 +- .../rules/InjectTypeCastForSwitchCaseRule.java | 6 +- .../rules/InlineUnnestFunctionRule.java | 15 +- .../rules/IntroduceAutogenerateIDRule.java | 12 +- ...eDynamicTypeCastForExternalFunctionRule.java | 4 +- .../rules/IntroduceDynamicTypeCastRule.java | 11 +- .../rules/IntroduceEnforcedListTypeRule.java | 3 +- ...aterializationForInsertWithSelfScanRule.java | 11 +- ...troduceRapidFrameFlushProjectAssignRule.java | 3 +- ...IntroduceSecondaryIndexInsertDeleteRule.java | 62 +- ...ntroduceTransactionCommitByAssignOpRule.java | 7 +- .../rules/ListifyUnnestingFunctionRule.java | 7 +- .../optimizer/rules/LoadRecordFieldsRule.java | 12 +- .../optimizer/rules/NestGroupByRule.java | 3 +- .../PushAggFuncIntoStandaloneAggregateRule.java | 29 +- .../PushAggregateIntoNestedSubplanRule.java | 28 +- .../rules/PushGroupByThroughProduct.java | 8 +- .../rules/PushProperJoinThroughProduct.java | 3 +- ...moveLeftOuterUnnestForLeftOuterJoinRule.java | 4 +- .../rules/RemoveRedundantListifyRule.java | 3 +- .../rules/RemoveRedundantSelectRule.java | 3 +- .../rules/SetAsterixPhysicalOperatorsRule.java | 44 +- .../rules/SetClosedRecordConstructorsRule.java | 3 +- .../rules/SetupCommitExtensionOpRule.java | 3 +- .../optimizer/rules/SimilarityCheckRule.java | 4 +- .../optimizer/rules/am/BTreeAccessMethod.java | 27 +- .../rules/am/IntroduceJoinAccessMethodRule.java | 4 +- ...IntroducePrimaryIndexForAggregationRule.java | 57 +- .../am/IntroduceSelectAccessMethodRule.java | 9 +- .../rules/am/InvertedIndexAccessMethod.java | 85 +- .../optimizer/rules/am/RTreeAccessMethod.java | 12 +- .../subplan/InlineAllNtsInSubplanVisitor.java | 30 +- ...neLeftNtsInSubplanJoinFlatteningVisitor.java | 4 +- ...ineSubplanInputForNestedTupleSourceRule.java | 82 +- .../rules/subplan/SubplanFlatteningUtil.java | 10 +- .../TranslateIntervalExpressionRule.java | 72 +- .../rules/util/EquivalenceClassUtils.java | 6 +- .../translator/AbstractLangTranslator.java | 4 +- .../AqlPlusExpressionToPlanTranslator.java | 1 - .../LangExpressionToPlanTranslator.java | 8 +- .../asterix/translator/SessionConfig.java | 7 +- .../SqlppExpressionToPlanTranslator.java | 12 +- .../asterix/translator/TranslationContext.java | 1 - .../translator/util/PlanTranslationUtil.java | 4 +- .../asterix/translator/util/ValidateUtil.java | 6 +- .../apache/asterix/api/common/APIFramework.java | 15 +- .../asterix/api/http/server/ApiServlet.java | 20 +- .../api/http/server/DiagnosticsApiServlet.java | 8 +- .../http/server/QueryCancellationServlet.java | 4 +- .../api/http/server/QueryServiceServlet.java | 12 +- .../asterix/api/http/server/RestApiServlet.java | 5 +- .../asterix/api/http/server/ResultUtil.java | 10 +- .../asterix/api/java/AsterixJavaClient.java | 3 +- .../app/active/ActiveNotificationHandler.java | 3 +- .../asterix/app/active/FeedEventsListener.java | 11 +- .../external/ExternalLibraryClassLoader.java | 3 +- .../app/external/ExternalLibraryUtils.java | 11 +- .../app/external/ExternalUDFLibrarian.java | 4 +- .../message/ExecuteStatementRequestMessage.java | 5 +- .../asterix/app/nc/NCAppRuntimeContext.java | 4 +- .../apache/asterix/app/nc/RecoveryManager.java | 15 +- .../app/replication/NcLifecycleCoordinator.java | 5 +- .../RegistrationTasksRequestMessage.java | 4 +- .../app/resource/RequiredCapacityVisitor.java | 4 +- .../asterix/drivers/AsterixClientDriver.java | 5 +- .../hyracks/bootstrap/CCApplication.java | 12 +- .../bootstrap/ClusterLifecycleListener.java | 4 +- .../bootstrap/GlobalRecoveryManager.java | 20 +- .../asterix/messaging/NCMessageBroker.java | 10 +- .../org/apache/asterix/utils/DataverseUtil.java | 4 +- .../apache/asterix/utils/FeedOperations.java | 33 +- .../apache/asterix/utils/FlushDatasetUtil.java | 8 +- .../org/apache/asterix/utils/RebalanceUtil.java | 15 +- .../org/apache/asterix/utils/ResourceUtils.java | 3 +- .../asterix/api/common/APIFrameworkTest.java | 16 +- .../common/AsterixHyracksIntegrationUtil.java | 8 +- .../http/servlet/ConnectorApiServletTest.java | 3 +- .../servlet/QueryCancellationServletTest.java | 4 +- .../api/http/servlet/VersionApiServletTest.java | 1 - .../app/bootstrap/TestNodeController.java | 152 +-- .../org/apache/asterix/common/TestDataUtil.java | 17 +- .../runtime/ClusterStateManagerTest.java | 3 +- .../org/apache/asterix/runtime/ExceptionIT.java | 4 +- .../asterix/test/active/ActiveStatsTest.java | 28 +- .../apache/asterix/test/aql/AQLTestSuite.java | 9 +- .../test/common/CancellationTestExecutor.java | 3 +- .../asterix/test/common/TestExecutor.java | 7 +- .../test/dataflow/ComponentRollbackTest.java | 14 +- .../asterix/test/dataflow/LogMarkerTest.java | 12 +- .../dataflow/MultiPartitionLSMIndexTest.java | 34 +- .../SearchCursorComponentSwitchTest.java | 9 +- .../ddl/SecondaryBTreeOperationsHelperTest.java | 8 +- .../org/apache/asterix/test/dml/DmlTest.java | 16 +- .../test/jsonplan/JsonLogicalPlanTest.java | 236 +++- .../asterix/test/logging/CheckpointingTest.java | 8 +- .../asterix/test/metadata/MetadataTest.java | 4 +- .../asterix/test/metadata/MetadataTxnTest.java | 16 +- .../asterix/test/optimizer/OptimizerTest.java | 28 +- .../asterix/test/runtime/LangExecutionUtil.java | 12 +- .../test/runtime/ReplicationExecutionTest.java | 3 +- .../asterix/test/sqlpp/RuntimeParserTest.java | 4 +- .../asterix/test/storage/DiskIsFullTest.java | 8 +- .../IndexDropOperatorNodePushableTest.java | 30 +- .../org/apache/asterix/clienthelper/Args.java | 10 +- .../asterix/clienthelper/AsterixHelper.java | 2 +- .../clienthelper/AsterixHelperExecution.java | 9 +- .../clienthelper/commands/RemoteCommand.java | 2 +- ...econdaryIndexSearchExpressionAnnotation.java | 3 +- .../common/api/IClusterManagementWork.java | 12 +- .../api/IClusterManagementWorkResponse.java | 1 - .../common/config/AsterixProperties.java | 12 +- .../common/config/CompilerProperties.java | 30 +- .../common/config/ExternalProperties.java | 7 +- .../common/config/MessagingProperties.java | 4 +- .../common/config/ReplicationProperties.java | 12 +- .../common/config/StorageProperties.java | 39 +- .../common/config/TransactionProperties.java | 35 +- .../common/context/DatasetMemoryManager.java | 6 +- .../common/functions/FunctionSignature.java | 7 +- .../AbstractLSMIOOperationCallback.java | 10 +- .../common/memory/ConcurrentFramePool.java | 12 +- .../common/messaging/api/INCMessageBroker.java | 3 +- .../apache/asterix/common/utils/PrintUtil.java | 2 +- .../asterix/common/utils/StoragePathUtil.java | 5 +- .../asterix/test/base/RetainLogsRule.java | 6 +- .../memory/ConcurrentFramePoolUnitTest.java | 40 +- .../dataflow/ChangeFeedDataFlowController.java | 2 +- .../ChangeFeedWithMetaDataFlowController.java | 2 +- .../dataflow/FeedRecordDataFlowController.java | 4 +- .../dataflow/RecordDataFlowController.java | 3 +- .../external/dataset/adapter/LookupAdapter.java | 2 +- .../feed/dataflow/FeedRuntimeInputHandler.java | 12 +- .../external/generator/DataGenerator.java | 18 +- .../external/generator/TweetGenerator.java | 2 +- .../external/indexing/FileOffsetIndexer.java | 8 +- .../external/indexing/IndexingScheduler.java | 6 +- .../indexing/RecordColumnarIndexer.java | 8 +- .../external/indexing/RecordIdReader.java | 4 +- .../input/record/RecordWithMetadataAndPK.java | 24 +- .../converter/DCPMessageToRecordConverter.java | 4 +- .../hdfs/AbstractCharRecordLookupReader.java | 2 +- .../record/reader/rss/RSSRecordReader.java | 2 +- .../stream/EmptyLineSeparatedRecordReader.java | 4 +- .../stream/SemiStructuredRecordReader.java | 6 +- .../stream/StreamRecordReaderFactory.java | 4 +- .../stream/TwitterFirehoseInputStream.java | 3 +- .../external/library/ExternalFunction.java | 6 +- .../external/library/JTypeObjectFactory.java | 1 - .../external/library/JavaFunctionHelper.java | 4 +- .../library/java/JObjectPointableVisitor.java | 6 +- .../asterix/external/parser/ADMDataParser.java | 83 +- .../external/parser/AbstractDataParser.java | 88 +- .../external/parser/DelimitedDataParser.java | 8 +- .../parser/RecordWithMetadataParser.java | 4 +- .../asterix/external/parser/TweetParser.java | 12 +- .../factory/DelimitedDataParserFactory.java | 8 +- .../parser/factory/HiveDataParserFactory.java | 4 +- .../provider/AdapterFactoryProvider.java | 4 +- .../provider/DatasourceFactoryProvider.java | 7 +- .../provider/StreamRecordReaderProvider.java | 4 +- .../external/util/LocalFileSystemUtils.java | 7 +- .../asterix/external/util/TwitterUtil.java | 3 +- .../asterix/external/classad/ClassAd.java | 4 +- .../asterix/external/classad/Operation.java | 29 +- .../classad/test/ClassAdParserTest.java | 2 +- .../external/classad/test/ClassAdToADMTest.java | 4 +- .../classad/test/ClassAdUnitTester.java | 15 +- .../record/reader/TestAsterixMembersReader.java | 4 +- .../external/library/CapitalFinderFunction.java | 3 +- .../asterix/external/library/ClassAdParser.java | 14 +- .../library/adapter/TestTypedAdapter.java | 3 +- .../adapter/TestTypedAdapterFactory.java | 10 +- .../external/parser/TestRecordWithPKParser.java | 4 +- .../external/parser/test/ADMDataParserTest.java | 20 +- .../ParserFactoryProviderLoadParserTest.java | 2 +- .../test/StreamRecordReaderProviderTest.java | 13 +- .../external/parser/test/TweetParserTest.java | 8 +- .../asterix/fuzzyjoin/FuzzyFiltersJaccard.java | 8 +- .../fuzzyjoin/FuzzyJoinAppendLength.java | 4 +- .../asterix/fuzzyjoin/FuzzyJoinMemory.java | 12 +- .../asterix/fuzzyjoin/FuzzyJoinTokenize.java | 13 +- .../fuzzyjoin/invertedlist/InvertedList.java | 1 - .../similarity/SimilarityFiltersJaccard.java | 14 +- .../similarity/SimilarityMetricJaccard.java | 4 +- .../tokenizer/TokenizerBufferedFactory.java | 3 +- .../asterix/fuzzyjoin/tests/FuzzyJoinTest.java | 3 +- .../tests/dataset/AbstractDataset.java | 3 +- .../fuzzyjoin/tests/dataset/DBLPDataset.java | 1 - .../asterix/lang/aql/parser/FunctionParser.java | 4 +- .../lang/aql/rewrites/AqlQueryRewriter.java | 4 +- .../aql/util/AQLVariableSubstitutionUtil.java | 4 +- .../AQLCloneAndSubstituteVariablesVisitor.java | 4 +- .../lang/common/base/IQueryRewriter.java | 5 +- .../asterix/lang/common/context/Scope.java | 2 +- .../asterix/lang/common/statement/Query.java | 3 +- .../rewrites/SqlppFunctionBodyRewriter.java | 4 +- .../visitor/InlineWithExpressionVisitor.java | 4 +- .../visitor/OperatorExpressionVisitor.java | 12 +- .../SqlppGroupByAggregationSugarVisitor.java | 5 +- .../visitor/SqlppInlineUdfsVisitor.java | 3 +- ...uteGroupbyExpressionWithVariableVisitor.java | 4 +- .../visitor/VariableCheckAndRewriteVisitor.java | 16 +- .../lang/sqlpp/util/FunctionMapUtil.java | 4 +- .../AbstractSqlppExpressionScopingVisitor.java | 9 +- .../EvaluatorMissingCheckVisitor.java | 4 +- .../EvaluatorNullCheckVisitor.java | 4 +- .../extension/grammar/GrammarExtensionMojo.java | 12 +- .../maven/plugin/TestDataGeneratorMojo.java | 1 - .../asterix/lexergenerator/LexerGenerator.java | 3 +- .../apache/asterix/lexergenerator/Fixtures.java | 60 +- .../lexergenerator/LexerNodeAddRuleTest.java | 31 +- .../lexergenerator/LexerNodeAppendNodeTest.java | 3 +- .../lexergenerator/LexerNodeAppendRuleTest.java | 22 +- .../LexerNodeAuxFunctionsTest.java | 37 +- .../lexergenerator/LexerNodeMergeNodeTest.java | 8 +- .../recordmanagergenerator/Generator.java | 36 +- .../RecordManagerGeneratorMojo.java | 10 +- .../metadata/bootstrap/MetadataBootstrap.java | 52 +- .../metadata/bootstrap/MetadataRecordTypes.java | 3 +- .../cluster/AbstractClusterManagementWork.java | 2 - .../cluster/ClusterManagementWorkResponse.java | 1 - .../asterix/metadata/declared/DataSource.java | 4 +- .../metadata/declared/DatasetDataSource.java | 9 +- .../metadata/declared/MetadataProvider.java | 113 +- .../asterix/metadata/entities/Dataset.java | 17 +- .../entities/ExternalDatasetDetails.java | 12 +- .../AbstractTupleTranslator.java | 12 +- .../metadata/feeds/FeedMetadataUtil.java | 3 +- .../functions/ExternalScalarFunctionInfo.java | 7 +- .../asterix/metadata/utils/DatasetUtil.java | 8 +- .../utils/ExternalIndexingOperations.java | 8 +- ...daryCorrelatedTreeIndexOperationsHelper.java | 9 +- .../utils/SecondaryIndexOperationsHelper.java | 13 +- .../SecondaryInvertedIndexOperationsHelper.java | 3 +- .../apache/asterix/builders/RecordBuilder.java | 16 +- .../common/PartialAggregationTypeComputer.java | 4 +- .../ACirclePartialBinaryComparatorFactory.java | 32 +- ...ADurationPartialBinaryComparatorFactory.java | 3 +- ...tervalAscPartialBinaryComparatorFactory.java | 3 +- ...ervalDescPartialBinaryComparatorFactory.java | 3 +- .../ALinePartialBinaryComparatorFactory.java | 71 +- .../AObjectAscBinaryComparatorFactory.java | 56 +- .../AObjectDescBinaryComparatorFactory.java | 4 +- .../APoint3DPartialBinaryComparatorFactory.java | 32 +- .../APointPartialBinaryComparatorFactory.java | 12 +- .../APolygonPartialBinaryComparatorFactory.java | 36 +- ...RectanglePartialBinaryComparatorFactory.java | 3 +- .../AUUIDPartialBinaryComparatorFactory.java | 6 +- .../ListItemBinaryComparatorFactory.java | 52 +- .../hash/AObjectBinaryHashFunctionFactory.java | 4 +- .../hash/ListItemBinaryHashFunctionFactory.java | 9 +- .../printers/adm/ADoublePrinterFactory.java | 3 +- .../printers/adm/AObjectPrinterFactory.java | 12 +- .../adm/AOptionalFieldPrinterFactory.java | 3 +- .../adm/AOrderedlistPrinterFactory.java | 4 +- .../printers/adm/ARecordPrinterFactory.java | 4 +- .../printers/adm/AUnionPrinterFactory.java | 5 +- .../printers/csv/ADoublePrinterFactory.java | 3 +- .../printers/csv/AInt16PrinterFactory.java | 4 +- .../printers/csv/AInt32PrinterFactory.java | 4 +- .../printers/csv/AInt64PrinterFactory.java | 4 +- .../printers/csv/AInt8PrinterFactory.java | 4 +- .../printers/csv/AObjectPrinterFactory.java | 4 +- .../csv/AOptionalFieldPrinterFactory.java | 4 +- .../printers/csv/ARecordPrinterFactory.java | 4 +- .../printers/csv/AUnionPrinterFactory.java | 5 +- .../json/clean/ADoublePrinterFactory.java | 4 +- .../json/clean/AFloatPrinterFactory.java | 4 +- .../json/clean/AInt16PrinterFactory.java | 4 +- .../json/clean/AInt32PrinterFactory.java | 4 +- .../json/clean/AInt64PrinterFactory.java | 4 +- .../json/clean/AInt8PrinterFactory.java | 4 +- .../json/clean/AObjectPrinterFactory.java | 12 +- .../clean/AOptionalFieldPrinterFactory.java | 4 +- .../json/clean/AOrderedlistPrinterFactory.java | 4 +- .../json/clean/ARecordPrinterFactory.java | 4 +- .../json/lossless/ADoublePrinterFactory.java | 4 +- .../json/lossless/AFloatPrinterFactory.java | 4 +- .../json/lossless/AObjectPrinterFactory.java | 12 +- .../lossless/AOptionalFieldPrinterFactory.java | 5 +- .../lossless/AOrderedlistPrinterFactory.java | 4 +- .../json/lossless/ARecordPrinterFactory.java | 4 +- .../serde/ARecordSerializerDeserializer.java | 16 +- .../PrimitiveValueProviderFactory.java | 12 +- .../BinaryTokenizerFactoryProvider.java | 10 +- .../LinearizeComparatorFactoryProvider.java | 4 +- .../org/apache/asterix/om/base/ABinary.java | 2 +- .../org/apache/asterix/om/base/ABoolean.java | 2 +- .../org/apache/asterix/om/base/ACircle.java | 2 +- .../java/org/apache/asterix/om/base/ADate.java | 2 +- .../org/apache/asterix/om/base/ADateTime.java | 2 +- .../asterix/om/base/ADayTimeDuration.java | 2 +- .../org/apache/asterix/om/base/ADouble.java | 2 +- .../org/apache/asterix/om/base/ADuration.java | 2 +- .../java/org/apache/asterix/om/base/AFloat.java | 2 +- .../apache/asterix/om/base/AGeneratedUUID.java | 13 +- .../java/org/apache/asterix/om/base/AInt16.java | 2 +- .../java/org/apache/asterix/om/base/AInt32.java | 2 +- .../java/org/apache/asterix/om/base/AInt64.java | 2 +- .../java/org/apache/asterix/om/base/AInt8.java | 2 +- .../org/apache/asterix/om/base/AInterval.java | 15 +- .../java/org/apache/asterix/om/base/ALine.java | 2 +- .../org/apache/asterix/om/base/AMissing.java | 2 +- .../apache/asterix/om/base/AMutableUUID.java | 10 +- .../java/org/apache/asterix/om/base/ANull.java | 2 +- .../apache/asterix/om/base/AOrderedList.java | 2 +- .../java/org/apache/asterix/om/base/APoint.java | 2 +- .../org/apache/asterix/om/base/APoint3D.java | 2 +- .../org/apache/asterix/om/base/APolygon.java | 2 +- .../org/apache/asterix/om/base/ARecord.java | 2 +- .../org/apache/asterix/om/base/ARectangle.java | 2 +- .../org/apache/asterix/om/base/AString.java | 2 +- .../java/org/apache/asterix/om/base/ATime.java | 2 +- .../java/org/apache/asterix/om/base/AUUID.java | 2 +- .../apache/asterix/om/base/AUnorderedList.java | 2 +- .../asterix/om/base/AYearMonthDuration.java | 2 +- .../base/temporal/ADateTimeParserFactory.java | 4 +- .../base/temporal/ADurationParserFactory.java | 23 +- .../om/base/temporal/ATimeParserFactory.java | 28 +- .../om/base/temporal/DateTimeFormatUtils.java | 8 +- .../base/temporal/GregorianCalendarSystem.java | 8 +- .../exceptions/InvalidExpressionException.java | 6 +- .../asterix/om/functions/BuiltinFunctions.java | 1241 +++++++++--------- .../om/functions/ExternalFunctionInfo.java | 4 +- .../pointables/ARecordVisitablePointable.java | 8 +- .../om/pointables/PointableAllocator.java | 20 +- .../pointables/base/DefaultOpenFieldType.java | 8 +- .../om/pointables/cast/ACastVisitor.java | 4 +- .../asterix/om/pointables/cast/AListCaster.java | 4 +- .../om/pointables/cast/ARecordCaster.java | 8 +- .../pointables/nonvisitor/AListPointable.java | 3 +- .../pointables/nonvisitor/ARecordPointable.java | 6 +- .../impl/CollectionMemberResultType.java | 3 +- .../impl/FieldAccessNestedResultType.java | 3 +- .../impl/NonTaggedGetItemResultType.java | 3 +- .../impl/RecordMergeTypeComputer.java | 14 +- .../impl/RecordRemoveFieldsTypeComputer.java | 10 +- .../impl/SubsetCollectionTypeComputer.java | 9 +- .../asterix/om/types/AOrderedListType.java | 2 +- .../org/apache/asterix/om/types/ATypeTag.java | 3 +- .../org/apache/asterix/om/types/AUnionType.java | 2 +- .../asterix/om/types/AUnorderedListType.java | 4 +- .../asterix/om/types/EnumDeserializer.java | 4 +- .../om/types/runtime/RuntimeRecordTypeInfo.java | 12 +- .../org/apache/asterix/om/utils/RecordUtil.java | 3 +- .../serde/SerializerDeserializerTestUtils.java | 24 +- .../serde/SimpleSerializerDeserializerTest.java | 4 +- .../replication/logging/RemoteLogsNotifier.java | 4 +- .../management/LogReplicationManager.java | 9 +- .../messaging/ReplicateFileTask.java | 4 +- .../replication/sync/FileSynchronizer.java | 4 +- .../AbstractScalarAggregateDescriptor.java | 4 +- ...bstractSerializableAvgAggregateFunction.java | 12 +- ...tractSerializableCountAggregateFunction.java | 12 +- .../SerializableSqlSumAggregateFunction.java | 3 +- .../std/SerializableSumAggregateFunction.java | 3 +- .../std/AbstractAvgAggregateFunction.java | 12 +- .../std/AbstractCountAggregateFunction.java | 8 +- .../std/AbstractMinMaxAggregateFunction.java | 8 +- .../aggregates/std/SqlSumAggregateFunction.java | 3 +- .../aggregates/std/SumAggregateFunction.java | 3 +- .../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 | 12 +- .../TemporalIntervalEndDateAccessor.java | 8 +- .../TemporalIntervalEndDatetimeAccessor.java | 4 +- .../TemporalIntervalEndTimeAccessor.java | 8 +- .../TemporalIntervalStartAccessor.java | 16 +- .../TemporalIntervalStartDateAccessor.java | 12 +- .../TemporalIntervalStartDatetimeAccessor.java | 8 +- .../TemporalIntervalStartTimeAccessor.java | 12 +- .../accessors/TemporalMillisecondAccessor.java | 4 +- .../accessors/TemporalMinuteAccessor.java | 4 +- .../accessors/TemporalMonthAccessor.java | 4 +- .../accessors/TemporalSecondAccessor.java | 4 +- .../accessors/TemporalYearAccessor.java | 4 +- .../evaluators/common/CreateMBREvalFactory.java | 8 +- .../common/EditDistanceCheckEvaluator.java | 15 +- .../common/EditDistanceEvaluator.java | 15 +- .../common/FullTextContainsEvaluator.java | 8 +- .../common/SimilarityFiltersCache.java | 4 +- .../common/SimilarityJaccardCheckEvaluator.java | 20 +- .../common/SimilarityJaccardEvaluator.java | 28 +- .../AbstractComparisonEvaluator.java | 8 +- .../comparisons/ComparisonHelper.java | 46 +- .../comparisons/DeepEqualAssessor.java | 4 +- .../AIntervalConstructorDescriptor.java | 4 +- ...ervalStartFromDateConstructorDescriptor.java | 4 +- ...lStartFromDateTimeConstructorDescriptor.java | 4 +- ...ervalStartFromTimeConstructorDescriptor.java | 4 +- .../ATimeConstructorDescriptor.java | 8 +- .../functions/AbstractBinaryStringBoolEval.java | 4 +- .../functions/AbstractBinaryStringIntEval.java | 4 +- .../AbstractNumericArithmeticEval.java | 27 +- .../functions/AbstractQuadStringStringEval.java | 4 +- .../functions/AbstractTripleStringBoolEval.java | 4 +- .../functions/AbstractTripleStringIntEval.java | 4 +- .../AbstractTripleStringStringEval.java | 4 +- .../AbstractUnaryNumericFunctionEval.java | 24 +- .../evaluators/functions/BinaryHashMap.java | 9 +- .../CountHashedGramTokensDescriptor.java | 4 +- .../functions/CreateCircleDescriptor.java | 4 +- .../functions/CreateLineDescriptor.java | 12 +- .../functions/CreatePointDescriptor.java | 4 +- .../functions/CreateRectangleDescriptor.java | 8 +- .../functions/CreateUUIDDescriptor.java | 4 +- .../functions/DeepEqualityDescriptor.java | 4 +- .../EditDistanceListIsFilterableDescriptor.java | 13 +- .../functions/FullTextContainsDescriptor.java | 8 +- ...FullTextContainsWithoutOptionDescriptor.java | 1 - .../functions/GramTokensDescriptor.java | 4 +- .../functions/HashedGramTokensDescriptor.java | 4 +- .../evaluators/functions/LenDescriptor.java | 8 +- .../functions/NumericATan2Descriptor.java | 4 +- .../functions/NumericCaretDescriptor.java | 2 +- .../functions/NumericDivideDescriptor.java | 2 +- .../functions/NumericTruncDescriptor.java | 14 +- .../functions/PrefixLenDescriptor.java | 12 +- .../functions/PrefixLenJaccardDescriptor.java | 4 +- .../SimilarityJaccardPrefixCheckDescriptor.java | 8 +- .../functions/SpatialIntersectDescriptor.java | 18 +- .../functions/StringContainsDescriptor.java | 3 +- .../functions/StringEndsWithDescriptor.java | 3 +- .../functions/StringEqualDescriptor.java | 3 +- .../functions/StringLengthDescriptor.java | 8 +- .../functions/StringRTrim2Descriptor.java | 1 - .../functions/StringRepeatDescriptor.java | 4 +- .../functions/StringSplitDescriptor.java | 8 +- .../functions/StringStartsWithDescriptor.java | 3 +- .../functions/StringToCodePointDescriptor.java | 4 +- .../functions/StringTrimDescriptor.java | 1 - .../functions/SubstringDescriptor.java | 3 +- .../functions/ToBooleanDescriptor.java | 3 +- .../functions/ToDoubleDescriptor.java | 2 +- .../evaluators/functions/UUIDDescriptor.java | 4 +- .../binary/AbstractFindBinaryEvaluator.java | 4 +- .../binary/AbstractSubBinaryEvaluator.java | 12 +- .../binary/BinaryLengthDescriptor.java | 6 +- .../binary/FindBinaryFromDescriptor.java | 3 +- .../functions/binary/ParseBinaryDescriptor.java | 4 +- .../records/GetRecordFieldsEvalFactory.java | 4 +- .../functions/records/RecordFieldsUtil.java | 37 +- .../records/RecordMergeDescriptor.java | 5 +- .../records/RecordPairsDescriptor.java | 4 +- .../records/RecordRemoveFieldsEvalFactory.java | 6 +- .../AbstractIntervalLogicFuncDescriptor.java | 20 +- .../CalendarDuartionFromDateDescriptor.java | 11 +- .../CalendarDurationFromDateTimeDescriptor.java | 11 +- .../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 | 4 +- .../temporal/DurationEqualDescriptor.java | 10 +- .../DurationFromIntervalDescriptor.java | 4 +- .../DurationFromMillisecondsDescriptor.java | 4 +- .../temporal/DurationFromMonthsDescriptor.java | 4 +- .../temporal/GetDayTimeDurationDescriptor.java | 7 +- .../GetOverlappingIntervalDescriptor.java | 21 +- .../GetYearMonthDurationDescriptor.java | 4 +- .../temporal/IntervalBinDescriptor.java | 8 +- ...llisecondsFromDayTimeDurationDescriptor.java | 4 +- .../MonthsFromYearMonthDurationDescriptor.java | 4 +- .../temporal/OverlapBinsDescriptor.java | 4 +- .../functions/temporal/ParseDateDescriptor.java | 4 +- .../temporal/ParseDateTimeDescriptor.java | 4 +- .../functions/temporal/ParseTimeDescriptor.java | 4 +- .../temporal/TimeFromDatetimeDescriptor.java | 4 +- .../TimeFromUnixTimeInMsDescriptor.java | 4 +- .../UnixTimeFromDateInDaysDescriptor.java | 4 +- .../UnixTimeFromDatetimeInMsDescriptor.java | 4 +- .../UnixTimeFromDatetimeInSecsDescriptor.java | 4 +- .../UnixTimeFromTimeInMsDescriptor.java | 4 +- .../YearMonthDurationComparatorDescriptor.java | 4 +- .../functions/utils/RegExpMatcher.java | 8 +- .../visitors/DeepEqualityVisitorHelper.java | 6 +- .../visitors/ListDeepEqualityChecker.java | 33 +- .../visitors/RecordDeepEqualityChecker.java | 4 +- .../exceptions/IncompatibleTypeException.java | 3 +- .../exceptions/TypeMismatchException.java | 1 - .../exceptions/UnsupportedTypeException.java | 3 +- .../job/listener/JobEventListenerFactory.java | 10 +- ...tiTransactionJobletEventListenerFactory.java | 3 +- .../runtime/job/listener/NodeJobTracker.java | 5 +- .../std/TidRunningAggregateDescriptor.java | 4 +- .../unnestingfunctions/std/RangeDescriptor.java | 4 +- .../runtime/utils/ClusterStateManager.java | 8 +- .../apache/asterix/server/test/LicensingIT.java | 4 +- .../server/test/NCServiceExecutionIT.java | 20 +- .../asterix/server/test/NcLifecycleIT.java | 3 +- .../apache/asterix/server/test/RecoveryIT.java | 8 +- .../asterix/server/test/ReplicationIT.java | 3 +- .../server/test/SampleLocalClusterIT.java | 8 +- .../testframework/template/TemplateHelper.java | 6 +- .../testframework/xml/TestSuiteParser.java | 4 +- .../asterix/tools/datagen/CustOrdDataGen.java | 20 +- .../asterix/tools/datagen/EventDataGen.java | 24 +- .../DataGeneratorForSpatialIndexEvaluation.java | 14 +- .../apache/asterix/tools/tbltoadm/TblToAdm.java | 3 +- .../asterix/tools/test/AdmDataGenTest.java | 16 +- ...daryIndexSearchOperationCallbackFactory.java | 4 +- .../PersistentLocalResourceRepository.java | 4 +- .../service/locking/LockManagerStats.java | 47 +- .../service/locking/ResourceGroup.java | 4 +- .../service/locking/ResourceGroupTable.java | 3 +- .../management/service/logging/LogBuffer.java | 4 +- .../management/service/logging/LogManager.java | 4 +- .../recovery/AbstractCheckpointManager.java | 3 +- .../service/recovery/CheckpointManager.java | 8 +- asterixdb/pom.xml | 40 +- asterixdb/src/main/assembly/source.xml | 2 +- .../common/exceptions/AlgebricksException.java | 4 +- ...ialFirstRuleCheckFixpointRuleController.java | 3 +- .../core/algebra/base/IHyracksJobBuilder.java | 3 +- .../core/algebra/base/ILogicalOperator.java | 2 +- .../core/algebra/base/IPhysicalOperator.java | 2 +- .../core/algebra/base/LogicalExpressionTag.java | 4 +- .../expressions/ExpressionRuntimeProvider.java | 6 +- .../IMergeAggregationExpressionFactory.java | 4 +- .../functions/AlgebricksBuiltinFunctions.java | 7 +- .../operators/logical/AbstractScanOperator.java | 1 - .../operators/logical/AggregateOperator.java | 8 +- .../operators/logical/AssignOperator.java | 4 +- .../operators/logical/GroupByOperator.java | 5 +- .../IndexInsertDeleteUpsertOperator.java | 4 +- .../operators/logical/IntersectOperator.java | 4 +- .../logical/LeftOuterJoinOperator.java | 6 +- .../operators/logical/MaterializeOperator.java | 3 +- .../logical/RunningAggregateOperator.java | 6 +- .../operators/logical/ScriptOperator.java | 4 +- .../operators/logical/TokenizeOperator.java | 23 +- .../operators/logical/UpdateOperator.java | 3 +- .../visitors/IsomorphismOperatorVisitor.java | 30 +- ...OperatorDeepCopyWithNewVariablesVisitor.java | 48 +- .../visitors/OperatorDeepCopyVisitor.java | 4 +- .../logical/visitors/VariableUtilities.java | 6 +- .../physical/AbstractExchangePOperator.java | 4 +- .../physical/AbstractHashJoinPOperator.java | 6 +- .../physical/AbstractJoinPOperator.java | 3 +- .../physical/AbstractPhysicalOperator.java | 8 +- .../AbstractPreclusteredGroupByPOperator.java | 7 +- .../operators/physical/AggregatePOperator.java | 8 +- .../operators/physical/AssignPOperator.java | 9 +- .../operators/physical/BulkloadPOperator.java | 12 +- .../physical/DataSourceScanPOperator.java | 6 +- .../physical/DistributeResultPOperator.java | 8 +- .../physical/ExternalGroupByPOperator.java | 26 +- .../HashPartitionMergeExchangePOperator.java | 12 +- .../physical/HybridHashJoinPOperator.java | 24 +- .../physical/InMemoryHashJoinPOperator.java | 12 +- .../physical/InMemoryStableSortPOperator.java | 3 +- .../physical/IndexBulkloadPOperator.java | 14 +- .../IndexInsertDeleteUpsertPOperator.java | 4 +- .../operators/physical/IntersectPOperator.java | 14 +- .../physical/MaterializePOperator.java | 8 +- .../MicroPreclusteredGroupByPOperator.java | 15 +- .../physical/NestedLoopJoinPOperator.java | 12 +- .../physical/PreclusteredGroupByPOperator.java | 8 +- .../RandomPartitionExchangePOperator.java | 6 +- .../RangePartitionExchangePOperator.java | 6 +- .../RangePartitionMergeExchangePOperator.java | 7 +- .../operators/physical/ReplicatePOperator.java | 8 +- .../physical/RunningAggregatePOperator.java | 4 +- .../operators/physical/SinkPOperator.java | 2 +- .../operators/physical/SinkWritePOperator.java | 15 +- .../physical/SortGroupByPOperator.java | 34 +- .../physical/SortMergeExchangePOperator.java | 4 +- .../operators/physical/SplitPOperator.java | 4 +- .../operators/physical/StableSortPOperator.java | 10 +- .../physical/StreamLimitPOperator.java | 16 +- .../physical/StreamProjectPOperator.java | 4 +- .../physical/StreamSelectPOperator.java | 8 +- .../StringStreamingScriptPOperator.java | 4 +- .../operators/physical/TokenizePOperator.java | 6 +- .../operators/physical/UnionAllPOperator.java | 12 +- .../prettyprint/AlgebricksAppendable.java | 3 +- .../LogicalExpressionPrettyPrintVisitor.java | 20 +- .../LogicalOperatorPrettyPrintVisitor.java | 3 +- .../IPartitioningRequirementsCoordinator.java | 84 +- .../properties/LocalGroupingProperty.java | 4 +- .../properties/StructuralPropertiesVector.java | 4 +- .../properties/TypePropagationPolicy.java | 4 +- .../algebra/util/OperatorManipulationUtil.java | 15 +- .../algebra/util/OperatorPropertiesUtil.java | 5 +- .../visitors/AbstractConstVarFunVisitor.java | 3 +- .../algebricks/core/jobgen/impl/JobBuilder.java | 11 +- .../core/jobgen/impl/JobGenHelper.java | 8 +- .../core/jobgen/impl/PlanCompiler.java | 3 +- .../core/rewriter/base/HeuristicOptimizer.java | 14 +- .../algebricks/core/utils/DotFormatBuilder.java | 10 +- .../core/utils/DotFormatGenerator.java | 59 +- .../core/utils/LogicalOperatorDotVisitor.java | 2 +- .../data/IBinaryHashFunctionFamilyProvider.java | 3 +- .../algebricks/data/utils/WriteValueTools.java | 8 +- .../rules/AbstractIntroduceCombinerRule.java | 5 +- .../AbstractIntroduceGroupByCombinerRule.java | 7 +- .../rules/BreakSelectIntoConjunctsRule.java | 3 +- .../rules/ComplexUnnestToProductRule.java | 4 +- .../rewriter/rules/CopyLimitDownRule.java | 4 +- .../rules/EnforceOrderByAfterSubplan.java | 19 +- .../rules/EnforceStructuralPropertiesRule.java | 4 +- .../rules/ExtractCommonExpressionsRule.java | 7 +- .../rules/ExtractCommonOperatorsRule.java | 17 +- .../ExtractFunctionsFromJoinConditionRule.java | 7 +- .../rules/ExtractGroupByDecorVariablesRule.java | 2 +- .../FactorRedundantGroupAndDecorVarsRule.java | 7 +- .../rewriter/rules/InferTypesRule.java | 3 +- .../InlineSingleReferenceVariablesRule.java | 3 +- .../rules/IntroJoinInsideSubplanRule.java | 8 +- .../rewriter/rules/PullSelectOutOfEqJoin.java | 3 +- .../rules/PushAssignBelowUnionAllRule.java | 6 +- .../rules/PushAssignDownThroughProductRule.java | 3 +- .../rewriter/rules/PushFunctionsBelowJoin.java | 3 +- .../rewriter/rules/PushGroupByIntoSortRule.java | 22 +- .../PushMapOperatorDownThroughProductRule.java | 2 +- ...hNestedOrderByUnderPreSortedGroupByRule.java | 3 +- .../PushProjectIntoDataSourceScanRule.java | 3 +- ...planWithAggregateDownThroughProductRule.java | 3 +- .../rules/PushUnnestDownThroughProductRule.java | 3 +- .../rules/PushUnnestDownThroughUnionRule.java | 17 +- .../rewriter/rules/ReinferAllTypesRule.java | 3 +- .../rules/RemoveRedundantProjectionRule.java | 3 +- .../rules/RemoveRedundantVariablesRule.java | 3 +- .../RemoveUnnecessarySortMergeExchange.java | 4 +- .../RemoveUnusedAssignAndAggregateRule.java | 12 +- .../SetAlgebricksPhysicalOperatorsRule.java | 12 +- .../rules/subplan/EliminateSubplanRule.java | 8 +- ...inateSubplanWithInputCardinalityOneRule.java | 6 +- .../subplan/IntroduceGroupByForSubplanRule.java | 12 +- ...oveFreeVariableOperatorOutOfSubplanRule.java | 2 +- .../rules/subplan/NestedSubplanToJoinRule.java | 4 +- .../subplan/PushSubplanIntoGroupByRule.java | 4 +- ...placeNtsWithSubplanInputOperatorVisitor.java | 4 +- .../rules/subplan/SubplanOutOfGroupRule.java | 3 +- .../util/PhysicalOptimizationsUtil.java | 7 +- ...SerializableAggregatorDescriptorFactory.java | 4 +- .../operators/meta/SubplanRuntimeFactory.java | 4 +- .../sort/InMemorySortRuntimeFactory.java | 7 +- .../ResultSerializerFactoryProvider.java | 4 +- .../pushruntime/IntegerConstantEvalFactory.java | 2 +- .../tests/pushruntime/PushRuntimeTest.java | 205 +-- .../algebricks/tests/tools/WriteValueTest.java | 12 +- .../util/AlgebricksHyracksIntegrationUtil.java | 6 +- .../impl/ActivityClusterGraphBuilder.java | 8 +- .../client/impl/JobActivityGraphBuilder.java | 4 +- .../apache/hyracks/api/comm/FrameConstants.java | 2 +- .../apache/hyracks/api/comm/FrameHelper.java | 3 +- .../hyracks/api/comm/IFrameTupleAppender.java | 8 +- .../hyracks/api/config/IApplicationConfig.java | 20 +- .../org/apache/hyracks/api/config/IOption.java | 4 +- .../constraints/PartitionConstraintHelper.java | 4 +- .../api/context/IHyracksCommonContext.java | 2 +- .../api/dataflow/value/JSONSerializable.java | 3 +- .../apache/hyracks/api/io/IODeviceHandle.java | 5 +- .../apache/hyracks/api/job/ActivityCluster.java | 8 +- .../hyracks/api/job/ActivityClusterGraph.java | 2 +- .../IActivityClusterGraphGeneratorFactory.java | 4 +- .../hyracks/api/job/JobActivityGraph.java | 3 +- .../org/apache/hyracks/api/job/JobInfo.java | 3 +- .../job/JobSerializerDeserializerContainer.java | 6 +- .../rewriter/ActivityClusterGraphRewriter.java | 16 +- .../OneToOneConnectedActivityCluster.java | 12 +- .../api/topology/TopologyDefinitionParser.java | 7 +- .../hyracks/api/util/ExecutionTimeProfiler.java | 1 - .../api/util/ExperimentProfilerUtils.java | 4 +- .../api/util/OperatorExecutionTimeProfiler.java | 4 +- .../hyracks/api/util/SpatialIndexProfiler.java | 5 +- .../hyracks/api/job/JobIdFactoryTest.java | 2 +- ...setDirectoryServiceInterfaceRemoteProxy.java | 8 +- .../client/dataset/HyracksDatasetReader.java | 9 +- .../client/stats/impl/ClientCounterContext.java | 6 +- .../client/stats/ClientCounterContextTest.java | 6 +- .../hyracks/control/cc/ClientInterfaceIPCI.java | 5 +- .../control/cc/ClusterControllerIPCI.java | 3 +- .../control/cc/ClusterControllerService.java | 24 +- .../control/cc/DeployedJobSpecStore.java | 9 +- .../hyracks/control/cc/cluster/NodeManager.java | 7 +- .../cc/executor/ActivityClusterPlanner.java | 36 +- .../apache/hyracks/control/cc/job/JobRun.java | 13 +- .../cc/partitions/PartitionMatchMaker.java | 3 +- .../cc/web/util/JSONOutputRequestUtil.java | 3 +- .../cc/work/AbstractTaskLifecycleWork.java | 4 +- .../control/cc/work/CliDeployBinaryWork.java | 4 +- .../control/cc/work/ClusterShutdownWork.java | 10 +- .../control/cc/work/DeployJobSpecWork.java | 3 +- .../hyracks/control/cc/work/GetJobInfoWork.java | 4 +- .../cc/work/GetJobSummariesJSONWork.java | 2 +- .../control/cc/work/GetNodeDetailsJSONWork.java | 5 +- .../control/cc/work/GetThreadDumpWork.java | 5 +- .../cc/work/JobletCleanupNotificationWork.java | 4 +- .../control/cc/work/RegisterNodeWork.java | 5 +- .../work/RegisterPartitionAvailibilityWork.java | 4 +- .../control/cc/work/ShutdownNCServiceWork.java | 1 + .../hyracks/control/cc/work/TriggerNCWork.java | 5 +- .../ConfigManagerApplicationConfig.java | 6 +- .../control/common/base/IClusterController.java | 7 +- .../control/common/base/INodeController.java | 4 +- .../control/common/config/ConfigManager.java | 7 +- .../control/common/config/ConfigUtils.java | 12 +- .../control/common/config/OptionTypes.java | 41 +- .../control/common/controllers/CCConfig.java | 9 +- .../common/controllers/ControllerConfig.java | 1 + .../control/common/controllers/NCConfig.java | 2 +- .../common/controllers/NodeRegistration.java | 13 +- .../common/controllers/ServiceConstants.java | 1 + .../common/deployment/DeploymentUtils.java | 12 +- .../ipc/ClusterControllerRemoteProxy.java | 32 +- .../common/ipc/NodeControllerRemoteProxy.java | 10 +- .../job/profiling/om/AbstractProfile.java | 2 +- .../common/job/profiling/om/JobProfile.java | 2 +- .../common/job/profiling/om/JobletProfile.java | 2 +- .../common/job/profiling/om/TaskProfile.java | 2 +- .../control/common/shutdown/ShutdownRun.java | 4 +- .../hyracks/control/common/work/WorkQueue.java | 8 +- .../control/nc/NodeControllerService.java | 13 +- .../org/apache/hyracks/control/nc/Task.java | 1 + .../nc/dataset/DatasetPartitionReader.java | 5 +- .../hyracks/control/nc/dataset/ResultState.java | 2 +- .../nc/io/profiling/IOCounterDefault.java | 2 +- .../partitions/MaterializedPartitionWriter.java | 4 +- .../MaterializingPipelinedPartition.java | 4 +- .../control/nc/partitions/PartitionManager.java | 3 +- .../ConnectorReceiverProfilingFrameReader.java | 4 +- .../nc/resources/memory/FrameManager.java | 7 +- .../control/nc/work/DeployBinaryWork.java | 4 +- .../work/ReportPartitionAvailabilityWork.java | 10 +- .../control/nc/service/NCServiceConfig.java | 12 +- .../data/std/primitive/ByteArrayPointable.java | 4 +- .../data/std/primitive/UTF8StringPointable.java | 4 +- .../hyracks/data/std/util/BinaryHashSet.java | 1 - .../data/std/util/UTF8StringBuilder.java | 3 +- .../std/primitive/ByteArrayPointableTest.java | 4 +- .../std/primitive/UTF8StringPointableTest.java | 4 +- .../util/UTF8StringCharacterIteratorTest.java | 2 +- .../common/comm/io/FrameFixedFieldAppender.java | 6 +- .../comm/io/FrameTupleAppenderAccessor.java | 9 +- .../FieldHashPartitionComputerFactory.java | 4 +- .../FieldHashPartitionComputerFamily.java | 7 +- .../FieldRangePartitionComputerFactory.java | 4 +- .../dataflow/common/utils/SerdeUtils.java | 3 +- .../dataflow/common/utils/TupleUtils.java | 14 +- .../FrameFixedFieldTupleAppenderTest.java | 4 +- .../std/base/AbstractOperatorDescriptor.java | 2 +- .../AbstractUnaryInputOperatorNodePushable.java | 4 +- .../buffermanager/DeallocatableFramePool.java | 4 +- .../std/buffermanager/FrameBufferManager.java | 1 - .../std/collectors/SortMergeFrameReader.java | 4 +- ...wareMToNPartitioningConnectorDescriptor.java | 4 +- .../MToNPartitioningConnectorDescriptor.java | 4 +- ...NPartitioningMergingConnectorDescriptor.java | 4 +- .../connectors/OneToOneConnectorDescriptor.java | 4 +- .../PartitionWithMessageDataWriter.java | 2 +- .../AbstractFileWriteOperatorDescriptor.java | 4 +- .../file/DelimitedDataTupleParserFactory.java | 4 +- .../std/group/HashSpillableTableFactory.java | 42 +- .../AvgFieldGroupAggregatorFactory.java | 6 +- .../AvgFieldMergeAggregatorFactory.java | 9 +- .../FloatSumFieldAggregatorFactory.java | 30 +- .../IntSumFieldAggregatorFactory.java | 6 +- .../MinMaxStringFieldAggregatorFactory.java | 12 +- .../MultiFieldsAggregatorFactory.java | 8 +- .../ExternalGroupBuildOperatorNodePushable.java | 4 +- .../ExternalGroupOperatorDescriptor.java | 4 +- .../ExternalGroupWriteOperatorNodePushable.java | 4 +- .../std/group/external/ExternalHashGroupBy.java | 3 +- .../preclustered/PreclusteredGroupWriter.java | 5 +- .../intersect/IntersectOperatorDescriptor.java | 9 +- .../join/HybridHashJoinOperatorDescriptor.java | 61 +- .../dataflow/std/join/InMemoryHashJoin.java | 20 +- .../InMemoryHashJoinOperatorDescriptor.java | 16 +- .../dataflow/std/join/JoinComparator.java | 4 +- .../dataflow/std/join/NestedLoopJoin.java | 10 +- .../join/NestedLoopJoinOperatorDescriptor.java | 4 +- .../std/join/OptimizedHybridHashJoin.java | 56 +- ...timizedHybridHashJoinOperatorDescriptor.java | 87 +- .../ConstantTupleSourceOperatorDescriptor.java | 4 +- .../std/misc/IdentityOperatorDescriptor.java | 2 +- .../std/misc/LimitOperatorDescriptor.java | 2 +- .../std/misc/MaterializerTaskState.java | 4 +- .../misc/MaterializingOperatorDescriptor.java | 4 +- .../result/ResultWriterOperatorDescriptor.java | 4 +- .../std/sort/RunMergingFrameReader.java | 5 +- .../std/sort/TopKSorterOperatorDescriptor.java | 6 +- .../sort/util/DeletableFrameTupleAppender.java | 4 +- .../dataflow/std/sort/util/GroupVSizeFrame.java | 3 +- .../std/structures/IResetableComparable.java | 2 +- .../std/structures/ISerializableTable.java | 3 +- .../dataflow/std/structures/MaxHeap.java | 1 - .../std/structures/SerializableHashTable.java | 16 +- .../structures/SimpleSerializableHashTable.java | 8 +- .../std/union/UnionAllOperatorDescriptor.java | 2 +- .../std/util/ReferencedPriorityQueue.java | 2 +- .../AbstractTupleMemoryManagerTest.java | 11 +- .../FrameFreeSlotBestFitUsingTreeMapTest.java | 3 +- .../VariableFramesMemoryManagerTest.java | 8 +- .../VariableTupleMemoryManagerTest.java | 3 +- .../util/DeletableFrameTupleAppenderTest.java | 6 +- .../dataflow/std/structures/MaxHeapTest.java | 2 +- .../dataflow/std/structures/MinHeapTest.java | 3 +- .../btree/client/InsertPipelineExample.java | 3 +- .../client/PrimaryIndexBulkLoadExample.java | 3 +- .../btree/client/PrimaryIndexSearchExample.java | 3 +- .../client/SecondaryIndexBulkLoadExample.java | 6 +- .../client/SecondaryIndexSearchExample.java | 3 +- .../tests/am/btree/DataSetConstants.java | 50 +- ...eWithAntiMatterTuplesOperatorTestHelper.java | 1 - .../comm/SerializationDeserializationTest.java | 4 +- .../integration/AbstractIntegrationTest.java | 4 +- .../AbstractMultiNCIntegrationTest.java | 3 +- .../tests/integration/AggregationTest.java | 144 +- .../tests/integration/CancelJobTest.java | 4 +- .../tests/integration/CountOfCountsTest.java | 93 +- .../tests/integration/DeployedJobSpecsTest.java | 12 +- .../tests/integration/HeapSortMergeTest.java | 24 +- .../integration/LocalityAwareConnectorTest.java | 52 +- .../integration/ReplicateOperatorTest.java | 8 +- .../tests/integration/ScanPrintTest.java | 71 +- .../tests/integration/SortMergeTest.java | 86 +- ...TPCHCustomerOptimizedHybridHashJoinTest.java | 75 +- .../TPCHCustomerOrderHashJoinTest.java | 308 +++-- .../TPCHCustomerOrderNestedLoopJoinTest.java | 288 ++-- .../hyracks/tests/integration/UnionTest.java | 26 +- .../integration/VSizeFrameSortMergeTest.java | 45 +- .../tests/rewriting/ErrorReportingTest.java | 2 +- .../rewriting/SuperActivityRewritingTest.java | 2 +- .../tests/unit/AbstractExternalGroupbyTest.java | 53 +- .../unit/IntersectOperatorDescriptorTest.java | 29 +- .../tests/unit/TopKRunGeneratorTest.java | 4 +- .../hyracks/tests/util/OutputFrameVerifier.java | 3 +- .../shutdown/test/ClusterShutdownIT.java | 1 + .../hyracks/examples/tpch/client/Common.java | 57 +- .../hyracks/examples/tpch/client/Groupby.java | 10 +- .../hyracks/examples/tpch/client/Sort.java | 20 +- .../hyracks/hdfs/api/INcCollectionBuilder.java | 5 +- .../hyracks/hdfs/api/ITupleWriterFactory.java | 3 +- .../dataflow/HDFSReadOperatorDescriptor.java | 2 +- .../IPProximityNcCollectionBuilder.java | 7 +- .../scheduler/RackAwareNcCollectionBuilder.java | 13 +- .../hyracks/hdfs/scheduler/Scheduler.java | 6 +- .../dataflow/HDFSReadOperatorDescriptor.java | 6 +- .../hyracks/hdfs2/scheduler/Scheduler.java | 3 +- .../hyracks/hdfs/dataflow/DataflowTest.java | 29 +- .../hyracks/hdfs/scheduler/SchedulerTest.java | 36 +- .../hyracks/hdfs2/dataflow/DataflowTest.java | 24 +- .../hyracks/hdfs2/scheduler/SchedulerTest.java | 24 +- .../server/HttpRequestCapacityController.java | 4 +- .../hyracks/ipc/impl/IPCConnectionManager.java | 5 +- ...ationBasedPayloadSerializerDeserializer.java | 4 +- .../org/apache/hyracks/ipc/impl/Message.java | 4 +- .../org/apache/hyracks/ipc/tests/IPCTest.java | 4 +- .../hyracks/maven/license/DependencySet.java | 2 +- .../maven/license/DownloadLicensesMojo.java | 8 +- .../hyracks/maven/license/GenerateFileMojo.java | 50 +- .../hyracks/maven/license/LicenseMojo.java | 79 +- .../hyracks/maven/license/LicenseSpec.java | 7 +- .../hyracks/maven/license/LicenseUtil.java | 4 +- .../apache/hyracks/maven/license/Override.java | 2 +- .../maven/license/SourcePointerResolver.java | 9 +- .../license/freemarker/IndentDirective.java | 5 +- .../license/freemarker/LoadFileDirective.java | 13 +- .../maven/license/project/LicensedProjects.java | 2 +- .../hyracks/maven/license/project/Project.java | 12 +- .../muxdemux/MultiplexedConnection.java | 4 +- .../server/process/HyracksVirtualCluster.java | 1 - .../am/bloomfilter/impls/BloomCalculations.java | 7 +- .../compressors/FieldPrefixCompressor.java | 28 +- .../am/btree/impls/FieldPrefixSlotManager.java | 3 +- .../IModificationOperationCallbackFactory.java | 5 +- .../api/ISearchOperationCallbackFactory.java | 4 +- .../am/common/api/ITreeIndexAccessor.java | 3 +- .../dataflow/IndexCreateOperatorDescriptor.java | 3 +- .../dataflow/IndexDropOperatorNodePushable.java | 2 +- .../IndexSearchOperatorNodePushable.java | 4 +- .../am/common/frames/AbstractSlotManager.java | 3 +- .../am/common/frames/LIFOMetaDataFrame.java | 28 +- .../AppendOnlyLinkedMetadataPageManager.java | 6 +- .../freepage/LinkedMetaDataPageManager.java | 8 +- .../am/common/impls/NoOpOperationCallback.java | 2 +- .../impls/NoOpOperationCallbackFactory.java | 3 +- .../am/common/ophelpers/FindTupleMode.java | 5 +- .../ophelpers/FindTupleNoExactMatchPolicy.java | 4 +- .../am/common/tuples/SimpleTupleReference.java | 4 +- .../storage/am/common/util/TreeIndexStats.java | 36 +- .../storage/am/common/util/TreeIndexUtils.java | 3 +- .../am/common/frames/LIFOMetadataFrameTest.java | 3 +- .../storage/am/lsm/btree/impls/LSMBTree.java | 3 +- .../btree/tuples/LSMBTreeCopyTupleWriter.java | 2 +- .../freepage/VirtualFreePageManagerFactory.java | 1 + .../am/lsm/common/impls/FilterBulkLoader.java | 5 +- .../storage/am/lsm/common/impls/LSMHarness.java | 12 +- ...rtitionedInMemoryInvertedIndexOpContext.java | 4 +- .../FixedSizeElementInvertedListCursor.java | 8 +- .../invertedindex/search/ArrayListFactory.java | 2 +- .../ConjunctiveEditDistanceSearchModifier.java | 1 - .../search/TOccurrenceSearcher.java | 3 +- .../tokenizers/AbstractUTF8Token.java | 3 +- .../DelimitedUTF8StringBinaryTokenizer.java | 8 +- ...limitedUTF8StringBinaryTokenizerFactory.java | 10 +- .../NGramUTF8StringBinaryTokenizer.java | 5 +- .../InvertedIndexTokenizingTupleIterator.java | 3 +- .../lsm/rtree/impls/LSMRTreeAbstractCursor.java | 1 - ...IGenericPrimitiveSerializerDeserializer.java | 3 +- .../am/rtree/frames/RStarTreePolicy.java | 39 +- .../am/rtree/frames/RTreeComputationUtils.java | 20 +- .../storage/am/rtree/frames/RTreeNSMFrame.java | 20 +- .../frames/RTreeNSMInteriorFrameFactory.java | 4 +- .../rtree/frames/RTreeNSMLeafFrameFactory.java | 4 +- .../storage/am/rtree/frames/RTreePolicy.java | 29 +- .../am/rtree/frames/RTreePolicyType.java | 3 +- .../storage/am/rtree/impls/EntriesOrder.java | 3 +- .../storage/am/rtree/impls/RTreeSplitKey.java | 6 +- .../storage/am/rtree/impls/Rectangle.java | 16 +- .../linearize/HilbertDoubleComparator.java | 4 +- .../rtree/linearize/ZCurveDoubleComparator.java | 4 +- .../buffercache/AsyncFIFOPageQueueManager.java | 43 +- .../storage/common/buffercache/BufferCache.java | 16 +- .../ClockPageReplacementStrategy.java | 5 +- .../common/buffercache/IFIFOPageWriter.java | 1 - .../buffercache/IPageReplacementStrategy.java | 3 +- .../storage/common/buffercache/QueueInfo.java | 8 +- .../am/btree/OrderedIndexBulkLoadTest.java | 4 +- .../am/btree/OrderedIndexDeleteTest.java | 4 +- .../am/btree/OrderedIndexSortedInsertTest.java | 4 +- .../am/btree/OrderedIndexTestDriver.java | 28 +- .../storage/am/btree/OrderedIndexTestUtils.java | 26 +- .../am/btree/OrderedIndexUpsertTest.java | 4 +- .../hyracks/storage/am/common/CheckTuple.java | 4 +- .../storage/am/common/IndexTestContext.java | 4 +- .../am/common/TestOperationCallback.java | 2 +- .../am/common/TestOperationSelector.java | 1 - .../storage/am/common/TreeIndexTestUtils.java | 12 +- .../am/common/datagen/IFieldValueGenerator.java | 1 + .../datagen/PersonNameFieldValueGenerator.java | 3 +- .../storage/am/common/datagen/TupleBatch.java | 5 +- .../am/common/datagen/TupleGenerator.java | 2 +- .../am/rtree/AbstractRTreeDeleteTest.java | 4 +- .../am/rtree/AbstractRTreeTestDriver.java | 32 +- .../storage/am/rtree/RTreeTestUtils.java | 4 +- .../am/lsm/btree/perf/BTreePageSizePerf.java | 15 +- .../am/lsm/btree/perf/PerfExperiment.java | 16 +- .../am/lsm/btree/tuples/LSMBTreeTuplesTest.java | 33 +- .../test/LSMComponentFilterReferenceTest.java | 2 +- .../common/test/VirtualFreePageManagerTest.java | 3 +- .../LSMInvertedIndexMultiThreadTestDriver.java | 3 +- .../tokenizers/NGramTokenizerTest.java | 12 +- .../tokenizers/WordTokenizerTest.java | 12 +- .../storage/common/IOManagerPathTest.java | 8 +- .../org/apache/hyracks/util/StorageUtil.java | 2 +- .../apache/hyracks/util/bytes/Base64Parser.java | 4 +- .../hyracks/util/bytes/Base64Printer.java | 22 +- .../apache/hyracks/util/bytes/HexParser.java | 18 +- .../hyracks/util/string/UTF8StringUtil.java | 4 +- .../org/apache/hyracks/util/trace/Tracer.java | 4 +- .../java/org/apache/hyracks/util/MathTest.java | 4 +- .../hyracks/util/string/UTF8StringUtilTest.java | 6 +- hyracks-fullstack/pom.xml | 40 +- hyracks-fullstack/src/main/assembly/source.xml | 19 +- 985 files changed, 5949 insertions(+), 5946 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveManager.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveManager.java b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveManager.java index aa9ac98..f9aef4c 100644 --- a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveManager.java +++ b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/ActiveManager.java @@ -57,7 +57,7 @@ public class ActiveManager { private volatile boolean shutdown; public ActiveManager(ExecutorService executor, String nodeId, long activeMemoryBudget, int frameSize, - INCServiceContext serviceCtx) throws HyracksDataException { + INCServiceContext serviceCtx) throws HyracksDataException { this.executor = executor; this.nodeId = nodeId; this.activeFramePool = new ConcurrentFramePool(nodeId, activeMemoryBudget, frameSize); @@ -115,18 +115,17 @@ public class ActiveManager { if (runtime == null) { LOGGER.warn("Request stats of a runtime that is not registered " + runtimeId); // Send a failure message - ((NodeControllerService) serviceCtx.getControllerService()) - .sendApplicationMessageToCC(message.getCcId(), - JavaSerializationUtils - .serialize(new ActiveStatsResponse(reqId, null, - new RuntimeDataException(ErrorCode.ACTIVE_MANAGER_INVALID_RUNTIME, - runtimeId.toString()))), null); + ((NodeControllerService) serviceCtx.getControllerService()).sendApplicationMessageToCC( + message.getCcId(), + JavaSerializationUtils.serialize(new ActiveStatsResponse(reqId, null, new RuntimeDataException( + ErrorCode.ACTIVE_MANAGER_INVALID_RUNTIME, runtimeId.toString()))), + null); return; } String stats = runtime.getStats(); ActiveStatsResponse response = new ActiveStatsResponse(reqId, stats, null); - ((NodeControllerService) serviceCtx.getControllerService()) - .sendApplicationMessageToCC(message.getCcId(), JavaSerializationUtils.serialize(response), null); + ((NodeControllerService) serviceCtx.getControllerService()).sendApplicationMessageToCC(message.getCcId(), + JavaSerializationUtils.serialize(response), null); } catch (Exception e) { throw HyracksDataException.create(e); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/DeployedJobService.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/DeployedJobService.java b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/DeployedJobService.java index b5b07ff..e12c5ca 100644 --- a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/DeployedJobService.java +++ b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/DeployedJobService.java @@ -94,8 +94,7 @@ public class DeployedJobService { LOGGER.log(Level.INFO, "Deployed Job execution completed for " + entityId.getExtensionName() + " " + entityId.getDataverse() - + "." - + entityId.getEntityName() + ". Took " + executionMilliseconds + " milliseconds "); + + "." + entityId.getEntityName() + ". Took " + executionMilliseconds + " milliseconds "); return executionMilliseconds; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/EntityId.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/EntityId.java b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/EntityId.java index 9e20e2f..5fe26bf 100644 --- a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/EntityId.java +++ b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/EntityId.java @@ -55,8 +55,8 @@ public class EntityId implements Serializable { return true; } EntityId other = (EntityId) o; - return Objects.equals(other.dataverse, dataverse) && Objects.equals(other.entityName, entityName) && - Objects.equals(other.extensionName, extensionName); + return Objects.equals(other.dataverse, dataverse) && Objects.equals(other.entityName, entityName) + && Objects.equals(other.extensionName, extensionName); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/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 2fd9079..11b86cb 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 @@ -123,8 +123,8 @@ public class BTreeSearchPOperator extends IndexSearchPOperator { // By nature, LEFT_OUTER_UNNEST_MAP should generate null values for non-matching tuples. boolean retainMissing = op.getOperatorTag() == LogicalOperatorTag.LEFT_OUTER_UNNEST_MAP; Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> btreeSearch = metadataProvider.buildBtreeRuntime( - builder.getJobSpec(), opSchema, typeEnv, context, jobGenParams.getRetainInput(), retainMissing, - dataset, jobGenParams.getIndexName(), lowKeyIndexes, highKeyIndexes, jobGenParams.isLowKeyInclusive(), + builder.getJobSpec(), opSchema, typeEnv, context, jobGenParams.getRetainInput(), retainMissing, dataset, + jobGenParams.getIndexName(), lowKeyIndexes, highKeyIndexes, jobGenParams.isLowKeyInclusive(), jobGenParams.isHighKeyInclusive(), propagateFilter, minFilterFieldIndexes, maxFilterFieldIndexes); builder.contributeHyracksOperator(unnestMap, btreeSearch.first); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/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 09092ff..f06fe45 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 @@ -84,8 +84,7 @@ public class CommitPOperator extends AbstractPhysicalOperator { int[] primaryKeyFields = JobGenHelper.variablesToFieldIndexes(primaryKeyLogicalVars, inputSchemas[0]); //get dataset splits - IPushRuntimeFactory runtime = dataset.getCommitRuntimeFactory(metadataProvider, primaryKeyFields, - isSink); + IPushRuntimeFactory runtime = dataset.getCommitRuntimeFactory(metadataProvider, primaryKeyFields, isSink); 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/cb9ca975/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/IRuleSetFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/IRuleSetFactory.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/IRuleSetFactory.java index dabac3d..2300e4a 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/IRuleSetFactory.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/IRuleSetFactory.java @@ -33,14 +33,12 @@ public interface IRuleSetFactory { * @throws AlgebricksException */ public List<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>> getLogicalRewrites( - ICcApplicationContext appCtx) - throws AlgebricksException; + ICcApplicationContext appCtx) throws AlgebricksException; /** * @return the physical rewrites */ public List<Pair<AbstractRuleController, List<IAlgebraicRewriteRule>>> getPhysicalRewrites( - ICcApplicationContext appCtx) - throws AlgebricksException; + ICcApplicationContext appCtx) throws AlgebricksException; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/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 8dca64b..93c7d79 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 @@ -110,8 +110,7 @@ public class AnalysisUtil { if (expr.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL) { AbstractFunctionCallExpression fc = (AbstractFunctionCallExpression) expr; FunctionIdentifier fid = fc.getFunctionIdentifier(); - if (fid.equals(BuiltinFunctions.FIELD_ACCESS_BY_INDEX) - || fid.equals(BuiltinFunctions.FIELD_ACCESS_BY_NAME) + if (fid.equals(BuiltinFunctions.FIELD_ACCESS_BY_INDEX) || fid.equals(BuiltinFunctions.FIELD_ACCESS_BY_NAME) || fid.equals(BuiltinFunctions.FIELD_ACCESS_NESTED)) { return true; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/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 ca54904..5a70d3c 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 @@ -47,14 +47,14 @@ public class AsterixIntroduceGroupByCombinerRule extends AbstractIntroduceGroupB SelectOperator selectNonSystemNull; if (aggregateVarsProducedByCombiner.size() == 1) { - ILogicalExpression isSystemNullTest = new ScalarFunctionCallExpression(finfoEq, - new MutableObject<ILogicalExpression>(new VariableReferenceExpression( - aggregateVarsProducedByCombiner.get(0)))); + ILogicalExpression isSystemNullTest = + new ScalarFunctionCallExpression(finfoEq, new MutableObject<ILogicalExpression>( + new VariableReferenceExpression(aggregateVarsProducedByCombiner.get(0)))); 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); + ScalarFunctionCallExpression nonSystemNullTest = + new ScalarFunctionCallExpression(finfoNot, new MutableObject<ILogicalExpression>(isSystemNullTest)); + selectNonSystemNull = + new SelectOperator(new MutableObject<ILogicalExpression>(nonSystemNullTest), false, null); } else { List<Mutable<ILogicalExpression>> isSystemNullTestList = new ArrayList<Mutable<ILogicalExpression>>(); for (LogicalVariable aggVar : aggregateVarsProducedByCombiner) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/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 957e164..5cf6769 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 @@ -62,8 +62,8 @@ public class ByNameToByHandleFieldAccessRule implements IAlgebraicRewriteRule { private static void byNameToByHandle(AssignOperator fieldAccessOp, IOptimizationContext context) { Mutable<ILogicalOperator> opUnder = fieldAccessOp.getInputs().get(0); - AbstractFunctionCallExpression fce = (AbstractFunctionCallExpression) fieldAccessOp.getExpressions().get(0) - .getValue(); + AbstractFunctionCallExpression fce = + (AbstractFunctionCallExpression) fieldAccessOp.getExpressions().get(0).getValue(); ILogicalExpression a1 = fce.getArguments().get(0).getValue(); VariableReferenceExpression x; @@ -84,16 +84,16 @@ public class ByNameToByHandleFieldAccessRule implements IAlgebraicRewriteRule { // let $t := type-of(x) LogicalVariable t = context.newVar(); - AbstractFunctionCallExpression typeOf = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(BuiltinFunctions.TYPE_OF)); + AbstractFunctionCallExpression typeOf = + new ScalarFunctionCallExpression(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); // let $w := get-handle($t, path-expression) LogicalVariable w = context.newVar(); - AbstractFunctionCallExpression getHandle = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(BuiltinFunctions.GET_HANDLE)); + AbstractFunctionCallExpression getHandle = + new ScalarFunctionCallExpression(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())); @@ -101,8 +101,8 @@ public class ByNameToByHandleFieldAccessRule implements IAlgebraicRewriteRule { handleAssign.getInputs().add(new MutableObject<ILogicalOperator>(typAssign)); // let $y := get-data(x, $w) - AbstractFunctionCallExpression getData = new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(BuiltinFunctions.GET_DATA)); + AbstractFunctionCallExpression getData = + new ScalarFunctionCallExpression(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))); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/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 1ace6fa..19cd4b6 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 @@ -148,8 +148,8 @@ public class ByNameToByIndexFieldAccessRule implements IAlgebraicRewriteRule { if (k < 0) { return null; } - return new ScalarFunctionCallExpression( - FunctionUtil.getFunctionInfo(BuiltinFunctions.FIELD_ACCESS_BY_INDEX), fce.getArguments().get(0), + return new ScalarFunctionCallExpression(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/cb9ca975/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 cf926d1..6cc87ad 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 @@ -186,8 +186,8 @@ public class CancelUnnestWithNestedListifyRule implements IAlgebraicRewriteRule return false; } - AbstractLogicalOperator nestedPlanRoot = (AbstractLogicalOperator) gby.getNestedPlans().get(0).getRoots().get(0) - .getValue(); + AbstractLogicalOperator nestedPlanRoot = + (AbstractLogicalOperator) gby.getNestedPlans().get(0).getRoots().get(0).getValue(); if (nestedPlanRoot.getOperatorTag() != LogicalOperatorTag.AGGREGATE) { return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CountVarToCountOneRule.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CountVarToCountOneRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CountVarToCountOneRule.java index 9c90b7c..46c441a 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CountVarToCountOneRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/CountVarToCountOneRule.java @@ -40,7 +40,8 @@ import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public class CountVarToCountOneRule implements IAlgebraicRewriteRule { @Override - public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) throws AlgebricksException { + public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context) + throws AlgebricksException { return false; } @@ -80,7 +81,8 @@ public class CountVarToCountOneRule implements IAlgebraicRewriteRule { if (exp3.getExpressionTag() != LogicalExpressionTag.VARIABLE) { return false; } - if (((AbstractLogicalOperator) agg.getInputs().get(0).getValue()).getOperatorTag() != LogicalOperatorTag.NESTEDTUPLESOURCE) { + if (((AbstractLogicalOperator) agg.getInputs().get(0).getValue()) + .getOperatorTag() != LogicalOperatorTag.NESTEDTUPLESOURCE) { return false; } fun.getArguments().get(0).setValue(new ConstantExpression(new AsterixConstantValue(new AInt64(1L)))); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/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 7b84e98..85ee0ef 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 @@ -127,8 +127,7 @@ public class DisjunctivePredicateToJoinRule implements IAlgebraicRewriteRule { ILogicalExpression cExp = new ConstantExpression(new AsterixConstantValue(list)); Mutable<ILogicalExpression> mutCExp = new MutableObject<>(cExp); - IFunctionInfo scanFctInfo = BuiltinFunctions - .getAsterixFunctionInfo(BuiltinFunctions.SCAN_COLLECTION); + IFunctionInfo scanFctInfo = BuiltinFunctions.getAsterixFunctionInfo(BuiltinFunctions.SCAN_COLLECTION); UnnestingFunctionCallExpression scanExp = new UnnestingFunctionCallExpression(scanFctInfo, mutCExp); LogicalVariable scanVar = context.newVar(); UnnestOperator unn = new UnnestOperator(scanVar, new MutableObject<>(scanExp)); @@ -186,9 +185,10 @@ public class DisjunctivePredicateToJoinRule implements IAlgebraicRewriteRule { return asSelectOperator(op.getValue()); } - private static AbstractFunctionCallExpression asFunctionCallExpression(ILogicalExpression ex, FunctionIdentifier fi) { - AbstractFunctionCallExpression fctCall = (ex.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL ? (AbstractFunctionCallExpression) ex - : null); + private static AbstractFunctionCallExpression asFunctionCallExpression(ILogicalExpression ex, + FunctionIdentifier fi) { + AbstractFunctionCallExpression fctCall = (ex.getExpressionTag() == LogicalExpressionTag.FUNCTION_CALL + ? (AbstractFunctionCallExpression) ex : null); if (fctCall != null && (fi == null || fctCall.getFunctionIdentifier().equals(fi))) return fctCall; return null; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/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 6c97858..fef2323 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,9 @@ public class FeedScanCollectionToUnnest implements IAlgebraicRewriteRule { UnnestOperator unnest = (UnnestOperator) op; ILogicalExpression unnestExpr = unnest.getExpressionRef().getValue(); if (needsScanCollection(unnestExpr, op)) { - ILogicalExpression newExpr = new UnnestingFunctionCallExpression( - FunctionUtil.getFunctionInfo(BuiltinFunctions.SCAN_COLLECTION), - new MutableObject<ILogicalExpression>(unnestExpr)); + ILogicalExpression newExpr = + new UnnestingFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.SCAN_COLLECTION), + new MutableObject<ILogicalExpression>(unnestExpr)); unnest.getExpressionRef().setValue(newExpr); context.addToDontApplySet(this, op); return true; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/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 d9e58f3..c594ff8 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 @@ -96,10 +96,10 @@ public class FixReplicateOperatorOutputsRule implements IAlgebraicRewriteRule { // when done with the whole plan, check that all replicate operators have been fixed // if there is one that has not been completely fixed, it indicates that one "old" parent couldn't be found - if (op.getOperatorTag() == LogicalOperatorTag.DISTRIBUTE_RESULT || - op.getOperatorTag() == LogicalOperatorTag.SINK || - (op.getOperatorTag() == LogicalOperatorTag.DELEGATE_OPERATOR && - ((DelegateOperator) op).getDelegate() instanceof CommitOperator)) { + if (op.getOperatorTag() == LogicalOperatorTag.DISTRIBUTE_RESULT + || op.getOperatorTag() == LogicalOperatorTag.SINK + || (op.getOperatorTag() == LogicalOperatorTag.DELEGATE_OPERATOR + && ((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); @@ -109,8 +109,8 @@ public class FixReplicateOperatorOutputsRule implements IAlgebraicRewriteRule { } // rewrite/fix only replicate operators - if ((op.getOperatorTag() != LogicalOperatorTag.REPLICATE && op.getOperatorTag() != LogicalOperatorTag.SPLIT) || - context.checkIfInDontApplySet(this, opRef.getValue())) { + if ((op.getOperatorTag() != LogicalOperatorTag.REPLICATE && op.getOperatorTag() != LogicalOperatorTag.SPLIT) + || context.checkIfInDontApplySet(this, opRef.getValue())) { return false; } AbstractReplicateOperator replicateOperator = (AbstractReplicateOperator) op; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FullTextContainsParameterCheckRule.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FullTextContainsParameterCheckRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FullTextContainsParameterCheckRule.java index 8bd3d79..a93b732 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FullTextContainsParameterCheckRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FullTextContainsParameterCheckRule.java @@ -80,7 +80,6 @@ public class FullTextContainsParameterCheckRule implements IAlgebraicRewriteRule return modified; } - /** * This visitor class handles actual checking and transformation. */
