VXQUERY-181 - Move to Hyracks 0.2.16 The change is touches a many files since Hyracks is part of an incubating project now. Otherwise its a pretty small change to make they system work with 0.2.16 (A changes to the frame classes).
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/5313291c Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/5313291c Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/5313291c Branch: refs/heads/prestonc/basex Commit: 5313291cc288af0f8ecae07f21531a4aee40c041 Parents: 9993868 Author: Preston Carman <[email protected]> Authored: Wed Oct 7 16:55:48 2015 -0700 Committer: Preston Carman <[email protected]> Committed: Wed Oct 7 16:55:48 2015 -0700 ---------------------------------------------------------------------- pom.xml | 40 ++--- vxquery-cli/pom.xml | 16 +- .../java/org/apache/vxquery/cli/VXQuery.java | 50 +++--- vxquery-core/pom.xml | 12 +- .../vxquery/collations/CodepointCollation.java | 2 +- .../apache/vxquery/collations/Collation.java | 2 +- .../vxquery/compiler/CompilerControlBlock.java | 2 +- .../VXQueryBinaryBooleanInspectorFactory.java | 10 +- .../VXQueryBinaryIntegerInspectorFactory.java | 10 +- .../VXQueryComparatorFactoryProvider.java | 10 +- .../algebricks/VXQueryConstantValue.java | 4 +- .../VXQueryExpressionRuntimeProvider.java | 48 ++--- .../algebricks/VXQueryGlobalDataFactory.java | 6 +- .../algebricks/VXQueryNullWriterFactory.java | 10 +- .../algebricks/VXQueryPrinterFactory.java | 6 +- .../VXQueryPrinterFactoryProvider.java | 8 +- ...ueryLogicalExpressionPrettyPrintVisitor.java | 30 ++-- .../compiler/rewriter/RewriteRuleset.java | 84 ++++----- .../rewriter/VXQueryOptimizationContext.java | 18 +- .../rewriter/rules/AbstractCollectionRule.java | 30 ++-- ...tractRemoveRedundantTypeExpressionsRule.java | 14 +- .../AbstractUsedVariablesProcessingRule.java | 18 +- .../rules/AbstractVXQueryAggregateRule.java | 6 +- .../rewriter/rules/CollectionFileDomain.java | 2 +- .../rules/ConsolidateAssignAggregateRule.java | 34 ++-- .../rules/ConsolidateDescandantChild.java | 22 +-- .../rewriter/rules/ConsolidateUnnestsRule.java | 20 +-- ...tAssignSortDistinctNodesToOperatorsRule.java | 48 ++--- .../rules/ConvertAssignToAggregateRule.java | 36 ++-- .../rules/ConvertAssignToUnnestRule.java | 22 +-- .../ConvertFromAlgebricksExpressionsRule.java | 24 +-- .../ConvertToAlgebricksExpressionsRule.java | 26 +-- .../EliminateSubplanForSingleItemsRule.java | 32 ++-- .../EliminateSubplanForSinglePathsRule.java | 14 +- .../EliminateUnnestAggregateSequencesRule.java | 28 +-- .../EliminateUnnestAggregateSubplanRule.java | 30 ++-- .../rewriter/rules/IntroduceCollectionRule.java | 16 +- .../rules/IntroduceTwoStepAggregateRule.java | 28 +-- .../rules/PushChildIntoDataScanRule.java | 20 +-- .../rules/PushFunctionsOntoEqJoinBranches.java | 32 ++-- .../RemoveRedundantBooleanExpressionsRule.java | 2 +- .../RemoveRedundantCastExpressionsRule.java | 2 +- .../RemoveRedundantDataExpressionsRule.java | 2 +- .../RemoveRedundantPromoteExpressionsRule.java | 2 +- .../RemoveRedundantTreatExpressionsRule.java | 2 +- .../RemoveUnusedSortDistinctNodesRule.java | 32 ++-- .../rules/RemoveUnusedUnnestIterateRule.java | 28 +-- .../rules/ReplaceSourceMapInDocExpression.java | 26 +-- .../rules/SetCollectionDataSourceRule.java | 6 +- .../rules/SetVariableIdContextRule.java | 14 +- .../ExtractFunctionsFromJoinConditionRule.java | 32 ++-- .../InlineNestedVariablesRule.java | 26 +-- ...oveFreeVariableOperatorOutOfSubplanRule.java | 22 +-- .../ConstantPropertyPropagationPolicy.java | 2 +- .../IPropertyPropagationPolicy.java | 2 +- .../InputPropertyPropagationPolicy.java | 2 +- .../cardinality/Cardinality.java | 2 +- .../documentorder/DocumentOrder.java | 2 +- .../DocumentOrderNOPropagationPolicy.java | 2 +- .../DocumentOrderYESPropagationPolicy.java | 2 +- .../uniquenodes/UniqueNodes.java | 2 +- .../UniqueNodesNOPropagationPolicy.java | 2 +- .../UniqueNodesYESPropagationPolicy.java | 2 +- .../rules/util/CardinalityRuleToolbox.java | 8 +- .../rewriter/rules/util/ExpressionToolbox.java | 24 +-- .../rewriter/rules/util/OperatorToolbox.java | 22 +-- .../context/DefaultDocumentURIResolverImpl.java | 2 +- .../context/DelegatingStaticContextImpl.java | 2 +- .../vxquery/context/DocumentURIResolver.java | 2 +- .../apache/vxquery/context/DynamicContext.java | 6 +- .../vxquery/context/DynamicContextImpl.java | 8 +- .../context/DynamicContextImplFactory.java | 8 +- .../vxquery/context/IDynamicContextFactory.java | 4 +- .../vxquery/context/IStaticContextFactory.java | 2 +- .../vxquery/context/ModuleURIResolver.java | 2 +- .../context/RootStaticContextFactory.java | 2 +- .../vxquery/context/RootStaticContextImpl.java | 2 +- .../apache/vxquery/context/StaticContext.java | 2 +- .../vxquery/context/StaticContextImpl.java | 2 +- .../context/StaticContextImplFactory.java | 2 +- .../vxquery/context/ThinStaticContextImpl.java | 2 +- .../context/ThinStaticContextImplFactory.java | 2 +- .../apache/vxquery/context/XQueryVariable.java | 4 +- .../datamodel/accessors/PointableCache.java | 4 +- .../datamodel/accessors/PointablePool.java | 6 +- .../accessors/PointablePoolFactory.java | 20 +-- .../datamodel/accessors/SequencePointable.java | 14 +- .../accessors/TaggedValuePointable.java | 14 +- .../datamodel/accessors/TypedPointables.java | 16 +- .../accessors/atomic/CodedQNamePointable.java | 12 +- .../accessors/atomic/XSBinaryPointable.java | 8 +- .../accessors/atomic/XSDatePointable.java | 14 +- .../accessors/atomic/XSDateTimePointable.java | 16 +- .../accessors/atomic/XSDecimalPointable.java | 20 +-- .../accessors/atomic/XSDurationPointable.java | 14 +- .../accessors/atomic/XSQNamePointable.java | 10 +- .../accessors/atomic/XSTimePointable.java | 14 +- .../accessors/nodes/AbstractNodePointable.java | 4 +- .../accessors/nodes/AttributeNodePointable.java | 10 +- .../accessors/nodes/DocumentNodePointable.java | 10 +- .../accessors/nodes/ElementNodePointable.java | 14 +- .../accessors/nodes/NodeTreePointable.java | 22 +-- .../accessors/nodes/PINodePointable.java | 12 +- .../nodes/TextOrCommentNodePointable.java | 10 +- .../builders/atomic/StringValueBuilder.java | 4 +- .../builders/atomic/UTF8StringBuilder.java | 6 +- .../builders/base/AbstractBuilder.java | 4 +- .../builders/base/AbstractValueBuilder.java | 2 +- .../datamodel/builders/base/IValueBuilder.java | 2 +- .../builders/nodes/AbstractNodeBuilder.java | 4 +- .../builders/nodes/AttributeNodeBuilder.java | 6 +- .../builders/nodes/CommentNodeBuilder.java | 6 +- .../builders/nodes/DictionaryBuilder.java | 14 +- .../builders/nodes/DocumentNodeBuilder.java | 6 +- .../builders/nodes/ElementNodeBuilder.java | 12 +- .../builders/nodes/NodeSubTreeBuilder.java | 4 +- .../datamodel/builders/nodes/PINodeBuilder.java | 6 +- .../builders/nodes/TextNodeBuilder.java | 6 +- .../builders/sequence/SequenceBuilder.java | 8 +- .../vxquery/datamodel/values/ValueTag.java | 2 +- .../vxquery/datamodel/values/XDMConstants.java | 8 +- .../DefaultSystemExceptionFactory.java | 2 +- .../vxquery/exceptions/ErrorReporter.java | 2 +- .../vxquery/exceptions/SystemException.java | 2 +- .../exceptions/SystemExceptionFactory.java | 2 +- .../exceptions/VXQueryDataException.java | 2 +- .../vxquery/exceptions/WarningReporter.java | 2 +- .../vxquery/functions/BuiltinFunction.java | 2 +- .../vxquery/functions/ExternalFunction.java | 2 +- .../org/apache/vxquery/functions/Function.java | 10 +- .../org/apache/vxquery/functions/Operator.java | 2 +- .../org/apache/vxquery/functions/Signature.java | 2 +- .../functions/UserDefinedXQueryFunction.java | 4 +- .../vxquery/metadata/QueryResultDataSink.java | 12 +- .../metadata/QueryResultSetDataSink.java | 12 +- .../metadata/VXQueryCollectionDataSource.java | 16 +- .../VXQueryCollectionOperatorDescriptor.java | 42 ++--- .../vxquery/metadata/VXQueryIOFileFilter.java | 2 +- .../metadata/VXQueryMetadataProvider.java | 58 +++--- .../org/apache/vxquery/result/ResultUtils.java | 6 +- .../VXQueryRawBinaryHashFunctionFactory.java | 6 +- ...AbstractMaxMinAggregateEvaluatorFactory.java | 14 +- .../AbstractMaxMinScalarEvaluatorFactory.java | 14 +- .../AvgGlobalAggregateEvaluatorFactory.java | 16 +- .../AvgLocalAggregateEvaluatorFactory.java | 14 +- .../FnAvgAggregateEvaluatorFactory.java | 14 +- .../aggregate/FnAvgScalarEvaluatorFactory.java | 14 +- .../FnCountAggregateEvaluatorFactory.java | 14 +- .../FnCountScalarEvaluatorFactory.java | 14 +- .../FnMaxAggregateEvaluatorFactory.java | 4 +- .../aggregate/FnMaxScalarEvaluatorFactory.java | 4 +- .../FnMinAggregateEvaluatorFactory.java | 4 +- .../aggregate/FnMinScalarEvaluatorFactory.java | 4 +- .../FnSumAggregateEvaluatorFactory.java | 14 +- .../aggregate/FnSumScalarEvaluatorFactory.java | 16 +- .../arithmetic/AbstractArithmeticOperation.java | 10 +- ...bstractArithmeticScalarEvaluatorFactory.java | 12 +- .../functions/arithmetic/AddOperation.java | 12 +- .../arithmetic/AddScalarEvaluatorFactory.java | 4 +- .../functions/arithmetic/DivideOperation.java | 12 +- .../DivideScalarEvaluatorFactory.java | 4 +- .../arithmetic/IntegerDivideOperation.java | 12 +- .../IntegerDivideScalarEvaluatorFactory.java | 4 +- .../functions/arithmetic/ModOperation.java | 12 +- .../arithmetic/ModScalarEvaluatorFactory.java | 4 +- .../functions/arithmetic/MultiplyOperation.java | 12 +- .../MultiplyScalarEvaluatorFactory.java | 4 +- .../functions/arithmetic/SubtractOperation.java | 12 +- .../SubtractScalarEvaluatorFactory.java | 4 +- ...ctTaggedValueArgumentAggregateEvaluator.java | 10 +- ...dValueArgumentAggregateEvaluatorFactory.java | 14 +- ...tractTaggedValueArgumentScalarEvaluator.java | 10 +- ...ggedValueArgumentScalarEvaluatorFactory.java | 10 +- ...ctTaggedValueArgumentUnnestingEvaluator.java | 10 +- ...dValueArgumentUnnestingEvaluatorFactory.java | 14 +- .../bool/AndScalarEvaluatorFactory.java | 16 +- .../bool/FnBooleanScalarEvaluatorFactory.java | 26 +-- .../bool/FnFalseScalarEvaluatorFactory.java | 12 +- .../bool/FnNotScalarEvaluatorFactory.java | 14 +- .../bool/FnTrueScalarEvaluatorFactory.java | 12 +- .../bool/OrScalarEvaluatorFactory.java | 16 +- .../functions/cast/AbstractCastToOperation.java | 16 +- .../cast/CastScalarEvaluatorFactory.java | 14 +- .../functions/cast/CastToAnyURIOperation.java | 4 +- .../cast/CastToBase64BinaryOperation.java | 6 +- .../functions/cast/CastToBooleanOperation.java | 12 +- .../functions/cast/CastToByteOperation.java | 20 +-- .../cast/CastToDTDurationOperation.java | 8 +- .../functions/cast/CastToDateOperation.java | 4 +- .../functions/cast/CastToDateTimeOperation.java | 4 +- .../functions/cast/CastToDecimalOperation.java | 22 +-- .../functions/cast/CastToDoubleOperation.java | 20 +-- .../functions/cast/CastToDurationOperation.java | 8 +- .../functions/cast/CastToEntityOperation.java | 2 +- .../functions/cast/CastToFloatOperation.java | 20 +-- .../functions/cast/CastToGDayOperation.java | 4 +- .../cast/CastToGMonthDayOperation.java | 4 +- .../functions/cast/CastToGMonthOperation.java | 4 +- .../cast/CastToGYearMonthOperation.java | 4 +- .../functions/cast/CastToGYearOperation.java | 4 +- .../cast/CastToHexBinaryOperation.java | 6 +- .../functions/cast/CastToIDOperation.java | 2 +- .../functions/cast/CastToIDREFOperation.java | 2 +- .../functions/cast/CastToIntOperation.java | 20 +-- .../functions/cast/CastToIntegerOperation.java | 20 +-- .../functions/cast/CastToLanguageOperation.java | 2 +- .../functions/cast/CastToLongOperation.java | 2 +- .../functions/cast/CastToNCNameOperation.java | 2 +- .../functions/cast/CastToNMTokenOperation.java | 2 +- .../functions/cast/CastToNameOperation.java | 2 +- .../cast/CastToNegativeIntegerOperation.java | 2 +- .../cast/CastToNonNegativeIntegerOperation.java | 2 +- .../cast/CastToNonPositiveIntegerOperation.java | 2 +- .../cast/CastToNormalizedStringOperation.java | 2 +- .../functions/cast/CastToNotationOperation.java | 4 +- .../cast/CastToPositiveIntegerOperation.java | 2 +- .../functions/cast/CastToQNameOperation.java | 6 +- .../functions/cast/CastToShortOperation.java | 20 +-- .../functions/cast/CastToStringOperation.java | 22 +-- .../functions/cast/CastToTimeOperation.java | 4 +- .../functions/cast/CastToTokenOperation.java | 2 +- .../cast/CastToUnsignedByteOperation.java | 2 +- .../cast/CastToUnsignedIntOperation.java | 2 +- .../cast/CastToUnsignedLongOperation.java | 2 +- .../cast/CastToUnsignedShortOperation.java | 2 +- .../cast/CastToUntypedAtomicOperation.java | 2 +- .../cast/CastToYMDurationOperation.java | 8 +- .../castable/AbstractCastableAsOperation.java | 16 +- .../castable/CastableAsAnyURIOperation.java | 4 +- .../CastableAsBase64BinaryOperation.java | 6 +- .../castable/CastableAsBooleanOperation.java | 14 +- .../castable/CastableAsByteOperation.java | 16 +- .../castable/CastableAsDTDurationOperation.java | 10 +- .../castable/CastableAsDateOperation.java | 6 +- .../castable/CastableAsDateTimeOperation.java | 6 +- .../castable/CastableAsDecimalOperation.java | 14 +- .../castable/CastableAsDoubleOperation.java | 20 +-- .../castable/CastableAsDurationOperation.java | 10 +- .../castable/CastableAsFloatOperation.java | 20 +-- .../castable/CastableAsGDayOperation.java | 6 +- .../castable/CastableAsGMonthDayOperation.java | 6 +- .../castable/CastableAsGMonthOperation.java | 6 +- .../castable/CastableAsGYearMonthOperation.java | 6 +- .../castable/CastableAsGYearOperation.java | 6 +- .../castable/CastableAsHexBinaryOperation.java | 6 +- .../castable/CastableAsIntOperation.java | 20 +-- .../castable/CastableAsIntegerOperation.java | 20 +-- .../castable/CastableAsLongOperation.java | 2 +- .../CastableAsNegativeIntegerOperation.java | 2 +- .../CastableAsNonNegativeIntegerOperation.java | 2 +- .../CastableAsNonPositiveIntegerOperation.java | 2 +- .../castable/CastableAsNotationOperation.java | 14 +- .../CastableAsPositiveIntegerOperation.java | 2 +- .../castable/CastableAsQNameOperation.java | 4 +- .../castable/CastableAsShortOperation.java | 18 +- .../castable/CastableAsStringOperation.java | 14 +- .../castable/CastableAsTimeOperation.java | 6 +- .../CastableAsUnsignedByteOperation.java | 2 +- .../CastableAsUnsignedIntOperation.java | 2 +- .../CastableAsUnsignedLongOperation.java | 2 +- .../CastableAsUnsignedShortOperation.java | 2 +- .../CastableAsUntypedAtomicOperation.java | 2 +- .../castable/CastableAsYMDurationOperation.java | 10 +- .../CastableScalarEvaluatorFactory.java | 14 +- .../AbstractDisjunctiveComparisonOperation.java | 14 +- .../AbstractNegatingComparisonOperation.java | 14 +- .../AbstractValueComparisonOperation.java | 14 +- ...ctValueComparisonScalarEvaluatorFactory.java | 16 +- .../comparison/ValueEqComparisonOperation.java | 16 +- ...ValueEqComparisonScalarEvaluatorFactory.java | 4 +- .../comparison/ValueGeComparisonOperation.java | 2 +- ...ValueGeComparisonScalarEvaluatorFactory.java | 4 +- .../comparison/ValueGtComparisonOperation.java | 2 +- ...ValueGtComparisonScalarEvaluatorFactory.java | 4 +- .../comparison/ValueLeComparisonOperation.java | 2 +- ...ValueLeComparisonScalarEvaluatorFactory.java | 4 +- .../comparison/ValueLtComparisonOperation.java | 16 +- ...ValueLtComparisonScalarEvaluatorFactory.java | 4 +- .../comparison/ValueNeComparisonOperation.java | 2 +- ...ValueNeComparisonScalarEvaluatorFactory.java | 4 +- ...GeneralComparisonScalarEvaluatorFactory.java | 18 +- ...neralEqComparisonScalarEvaluatorFactory.java | 4 +- ...neralGeComparisonScalarEvaluatorFactory.java | 4 +- ...neralGtComparisonScalarEvaluatorFactory.java | 4 +- ...neralLeComparisonScalarEvaluatorFactory.java | 4 +- ...neralLtComparisonScalarEvaluatorFactory.java | 4 +- ...neralNeComparisonScalarEvaluatorFactory.java | 4 +- .../IfThenElseScalarEvaluatorFactory.java | 16 +- ...ValueFromDateTimeScalarEvaluatorFactory.java | 12 +- ...ValueFromDurationScalarEvaluatorFactory.java | 16 +- ...ateTimeToTimezoneScalarEvaluatorFactory.java | 14 +- ...ustDateToTimezoneScalarEvaluatorFactory.java | 14 +- ...ustTimeToTimezoneScalarEvaluatorFactory.java | 14 +- .../FnCurrentDateScalarEvaluatorFactory.java | 12 +- ...FnCurrentDateTimeScalarEvaluatorFactory.java | 14 +- .../FnCurrentTimeScalarEvaluatorFactory.java | 14 +- .../FnDateTimeScalarEvaluatorFactory.java | 12 +- .../FnDayFromDateScalarEvaluatorFactory.java | 2 +- ...FnDayFromDateTimeScalarEvaluatorFactory.java | 2 +- ...nDaysFromDurationScalarEvaluatorFactory.java | 2 +- ...HoursFromDateTimeScalarEvaluatorFactory.java | 2 +- ...HoursFromDurationScalarEvaluatorFactory.java | 2 +- .../FnHoursFromTimeScalarEvaluatorFactory.java | 2 +- ...nImplicitTimezoneScalarEvaluatorFactory.java | 12 +- ...nutesFromDateTimeScalarEvaluatorFactory.java | 2 +- ...nutesFromDurationScalarEvaluatorFactory.java | 2 +- ...FnMinutesFromTimeScalarEvaluatorFactory.java | 2 +- .../FnMonthFromDateScalarEvaluatorFactory.java | 2 +- ...MonthFromDateTimeScalarEvaluatorFactory.java | 2 +- ...onthsFromDurationScalarEvaluatorFactory.java | 2 +- ...condsFromDateTimeScalarEvaluatorFactory.java | 2 +- ...condsFromDurationScalarEvaluatorFactory.java | 2 +- ...FnSecondsFromTimeScalarEvaluatorFactory.java | 2 +- ...nTimezoneFromDateScalarEvaluatorFactory.java | 2 +- ...ezoneFromDateTimeScalarEvaluatorFactory.java | 2 +- ...nTimezoneFromTimeScalarEvaluatorFactory.java | 2 +- .../FnYearFromDateScalarEvaluatorFactory.java | 2 +- ...nYearFromDateTimeScalarEvaluatorFactory.java | 2 +- ...YearsFromDurationScalarEvaluatorFactory.java | 2 +- .../error/FnErrorScalarEvaluatorFactory.java | 16 +- .../misc/FnDataScalarEvaluatorFactory.java | 14 +- .../AbstractNodeConstructorScalarEvaluator.java | 12 +- .../AbstractNodePositionalCheckEvaluator.java | 6 +- ...AttributeNodeConstructorScalarEvaluator.java | 10 +- ...teNodeConstructorScalarEvaluatorFactory.java | 10 +- .../CommentNodeConstructorScalarEvaluator.java | 10 +- ...ntNodeConstructorScalarEvaluatorFactory.java | 10 +- .../ElementNodeConstructorScalarEvaluator.java | 14 +- ...ntNodeConstructorScalarEvaluatorFactory.java | 10 +- .../FnDocAvailableScalarEvaluatorFactory.java | 18 +- .../node/FnDocScalarEvaluatorFactory.java | 18 +- .../node/FnNumberScalarEvaluatorFactory.java | 12 +- .../node/IdFromNodeScalarEvaluatorFactory.java | 12 +- .../LocalIdFromNodeScalarEvaluatorFactory.java | 12 +- .../functions/node/OpNodeAfterEvaluator.java | 2 +- .../node/OpNodeAfterEvaluatorFactory.java | 8 +- .../functions/node/OpNodeBeforeEvaluator.java | 2 +- .../node/OpNodeBeforeEvaluatorFactory.java | 8 +- .../node/PINodeConstructorScalarEvaluator.java | 10 +- ...PINodeConstructorScalarEvaluatorFactory.java | 10 +- .../TextNodeConstructorScalarEvaluator.java | 10 +- ...xtNodeConstructorScalarEvaluatorFactory.java | 10 +- .../TreeIdFromNodeScalarEvaluatorFactory.java | 12 +- ...NodesAscOrAtomicsScalarEvaluatorFactory.java | 12 +- .../numeric/AbstractNumericOperation.java | 6 +- .../AbstractNumericScalarEvaluatorFactory.java | 16 +- .../functions/numeric/FnAbsOperation.java | 8 +- .../numeric/FnAbsScalarEvaluatorFactory.java | 4 +- .../functions/numeric/FnCeilingOperation.java | 8 +- .../FnCeilingScalarEvaluatorFactory.java | 4 +- .../functions/numeric/FnFloorOperation.java | 8 +- .../numeric/FnFloorScalarEvaluatorFactory.java | 4 +- ...FnRoundHalfToEvenScalarEvaluatorFactory.java | 26 +-- .../functions/numeric/FnRoundOperation.java | 8 +- .../numeric/FnRoundScalarEvaluatorFactory.java | 4 +- ...ocalNameFromQNameScalarEvaluatorFactory.java | 16 +- ...spaceUriFromQNameScalarEvaluatorFactory.java | 16 +- ...FnPrefixFromQNameScalarEvaluatorFactory.java | 16 +- .../qname/FnQNameScalarEvaluatorFactory.java | 16 +- .../ConcatenateScalarEvaluatorFactory.java | 16 +- .../FnDistinctValuesScalarEvaluatorFactory.java | 18 +- .../sequence/FnEmptyScalarEvaluatorFactory.java | 12 +- .../FnExactlyOneScalarEvaluatorFactory.java | 12 +- .../FnExistsScalarEvaluatorFactory.java | 12 +- .../FnIndexOfScalarEvaluatorFactory.java | 16 +- .../FnInsertBeforeScalarEvaluatorFactory.java | 18 +- .../FnOneOrMoreScalarEvaluatorFactory.java | 12 +- .../FnRemoveScalarEvaluatorFactory.java | 18 +- .../FnReverseScalarEvaluatorFactory.java | 16 +- .../FnSubsequenceScalarEvaluatorFactory.java | 20 +-- .../FnUnorderedScalarEvaluatorFactory.java | 12 +- .../FnZeroOrOneScalarEvaluatorFactory.java | 12 +- .../IterateUnnestingEvaluatorFactory.java | 14 +- .../sequence/OpToScalarEvaluatorFactory.java | 16 +- .../SequenceAggregateEvaluatorFactory.java | 16 +- ...stractDescendantPathStepScalarEvaluator.java | 8 +- .../step/AbstractForwardAxisPathStep.java | 8 +- .../step/AbstractPathStepScalarEvaluator.java | 10 +- .../AbstractSinglePathStepScalarEvaluator.java | 12 +- .../step/AttributePathStepScalarEvaluator.java | 6 +- ...AttributePathStepScalarEvaluatorFactory.java | 10 +- .../step/ChildPathStepOperatorDescriptor.java | 8 +- .../step/ChildPathStepScalarEvaluator.java | 12 +- .../ChildPathStepScalarEvaluatorFactory.java | 10 +- .../functions/step/ChildPathStepUnnesting.java | 10 +- .../step/ChildPathStepUnnestingEvaluator.java | 10 +- .../ChildPathStepUnnestingEvaluatorFactory.java | 12 +- ...DescendantOrSelfPathStepScalarEvaluator.java | 12 +- ...antOrSelfPathStepScalarEvaluatorFactory.java | 10 +- .../step/DescendantOrSelfPathStepUnnesting.java | 10 +- ...cendantOrSelfPathStepUnnestingEvaluator.java | 10 +- ...OrSelfPathStepUnnestingEvaluatorFactory.java | 12 +- .../step/DescendantPathStepScalarEvaluator.java | 12 +- ...escendantPathStepScalarEvaluatorFactory.java | 10 +- .../DescendantPathStepUnnestingEvaluator.java | 10 +- ...endantPathStepUnnestingEvaluatorFactory.java | 12 +- .../runtime/functions/step/NodeTestFilter.java | 8 +- .../step/SelfPathStepScalarEvaluator.java | 10 +- .../SelfPathStepScalarEvaluatorFactory.java | 10 +- ...stractCharacterIteratorCopyingEvaluator.java | 6 +- ...haracterIteratorCopyingEvaluatorFactory.java | 2 +- .../FnCodepointEqualEvaluatorFactory.java | 12 +- .../FnCodepointsToStringEvaluatorFactory.java | 16 +- .../strings/FnCompareEvaluatorFactory.java | 14 +- .../strings/FnConcatEvaluatorFactory.java | 14 +- .../strings/FnContainsEvaluatorFactory.java | 12 +- .../strings/FnEndsWithEvaluatorFactory.java | 12 +- .../strings/FnLowerCaseEvaluatorFactory.java | 10 +- .../strings/FnStartsWithEvaluatorFactory.java | 12 +- .../strings/FnStringJoinEvaluatorFactory.java | 14 +- .../strings/FnStringLengthEvaluatorFactory.java | 14 +- .../strings/FnStringScalarEvaluatorFactory.java | 14 +- .../FnStringToCodepointsEvaluatorFactory.java | 14 +- .../FnSubstringAfterEvaluatorFactory.java | 10 +- .../FnSubstringBeforeEvaluatorFactory.java | 10 +- .../strings/FnSubstringEvaluatorFactory.java | 16 +- .../strings/FnUpperCaseEvaluatorFactory.java | 10 +- .../strings/UTF8StringCharacterIterator.java | 2 +- .../AbstractTypeScalarEvaluatorFactory.java | 12 +- .../type/InstanceOfScalarEvaluatorFactory.java | 12 +- .../type/PromoteScalarEvaluatorFactory.java | 14 +- .../functions/type/SequenceTypeMatcher.java | 4 +- .../type/TreatScalarEvaluatorFactory.java | 12 +- .../unary/AbstractNumericUnaryOperation.java | 6 +- ...tractNumericUnaryScalarEvaluatorFactory.java | 16 +- .../unary/NumericUnaryMinusOperation.java | 8 +- ...NumericUnaryMinusScalarEvaluatorFactory.java | 4 +- .../unary/NumericUnaryPlusOperation.java | 8 +- .../NumericUnaryPlusScalarEvaluatorFactory.java | 4 +- .../functions/util/ArithmeticHelper.java | 8 +- .../runtime/functions/util/AtomizeHelper.java | 6 +- .../runtime/functions/util/FunctionHelper.java | 14 +- ...XQueryBinaryHashFunctionFactoryProvider.java | 6 +- ...VXQueryBinaryHashFunctionFamilyProvider.java | 8 +- .../vxquery/serializer/XMLSerializer.java | 26 +-- .../apache/vxquery/types/AbstractNodeType.java | 2 +- .../org/apache/vxquery/types/AnyNodeType.java | 2 +- .../org/apache/vxquery/types/AnySimpleType.java | 2 +- .../java/org/apache/vxquery/types/AnyType.java | 2 +- .../org/apache/vxquery/types/AtomicType.java | 2 +- .../org/apache/vxquery/types/AttributeType.java | 2 +- .../apache/vxquery/types/BuiltinAtomicType.java | 2 +- .../vxquery/types/BuiltinTypeConstants.java | 2 +- .../apache/vxquery/types/BuiltinTypeQNames.java | 2 +- .../vxquery/types/BuiltinTypeRegistry.java | 2 +- .../org/apache/vxquery/types/CommentType.java | 2 +- .../org/apache/vxquery/types/ComplexType.java | 2 +- .../apache/vxquery/types/DerivationProcess.java | 2 +- .../org/apache/vxquery/types/DocumentType.java | 2 +- .../org/apache/vxquery/types/ElementType.java | 2 +- .../apache/vxquery/types/EmptySequenceType.java | 2 +- .../java/org/apache/vxquery/types/ItemType.java | 2 +- .../java/org/apache/vxquery/types/NameTest.java | 4 +- .../java/org/apache/vxquery/types/NodeKind.java | 2 +- .../java/org/apache/vxquery/types/NodeType.java | 2 +- .../java/org/apache/vxquery/types/NoneType.java | 2 +- .../types/ProcessingInstructionType.java | 4 +- .../org/apache/vxquery/types/SchemaType.java | 2 +- .../org/apache/vxquery/types/SimpleType.java | 2 +- .../java/org/apache/vxquery/types/TextType.java | 2 +- .../org/apache/vxquery/types/TypeHelper.java | 2 +- .../org/apache/vxquery/types/TypeUtils.java | 2 +- .../java/org/apache/vxquery/types/XQType.java | 2 +- .../java/org/apache/vxquery/util/Filter.java | 2 +- .../apache/vxquery/util/GrowableIntArray.java | 2 +- .../org/apache/vxquery/util/SourceLocation.java | 2 +- .../vxquery/xmlparser/ITreeNodeIdProvider.java | 2 +- .../vxquery/xmlparser/SAXContentHandler.java | 77 ++++---- .../vxquery/xmlparser/TreeNodeIdProvider.java | 2 +- .../org/apache/vxquery/xmlparser/XMLParser.java | 28 ++- .../apache/vxquery/xmlquery/ast/ASTNode.java | 2 +- .../org/apache/vxquery/xmlquery/ast/ASTTag.java | 2 +- .../vxquery/xmlquery/ast/AnyNodeTestNode.java | 2 +- .../vxquery/xmlquery/ast/AtomicTypeNode.java | 2 +- .../vxquery/xmlquery/ast/AttributeTestNode.java | 2 +- .../vxquery/xmlquery/ast/AxisStepNode.java | 2 +- .../vxquery/xmlquery/ast/BaseUriDeclNode.java | 2 +- .../xmlquery/ast/BoundarySpaceDeclNode.java | 2 +- .../vxquery/xmlquery/ast/CDataSectionNode.java | 2 +- .../vxquery/xmlquery/ast/CaseClauseNode.java | 2 +- .../vxquery/xmlquery/ast/CommentTestNode.java | 2 +- .../ast/ComputedAttributeConstructorNode.java | 2 +- .../ast/ComputedCommentConstructorNode.java | 2 +- .../ast/ComputedDocumentConstructorNode.java | 2 +- .../ast/ComputedElementConstructorNode.java | 2 +- .../xmlquery/ast/ComputedPIConstructorNode.java | 2 +- .../ast/ComputedTextConstructorNode.java | 2 +- .../xmlquery/ast/ConstructionDeclNode.java | 2 +- .../vxquery/xmlquery/ast/ContentCharsNode.java | 2 +- .../xmlquery/ast/ContextItemExprNode.java | 2 +- .../xmlquery/ast/CopyNamespacesDeclNode.java | 2 +- .../ast/DQuotedAttributeContentNode.java | 2 +- .../xmlquery/ast/DefaultCollationDeclNode.java | 2 +- .../ast/DefaultElementNamespaceDeclNode.java | 2 +- .../ast/DefaultFunctionNamespaceDeclNode.java | 2 +- .../ast/DirectAttributeConstructorNode.java | 2 +- .../ast/DirectCommentConstructorNode.java | 2 +- .../ast/DirectElementConstructorNode.java | 2 +- .../xmlquery/ast/DirectPIConstructorNode.java | 2 +- .../vxquery/xmlquery/ast/DocumentTestNode.java | 2 +- .../vxquery/xmlquery/ast/ElementTestNode.java | 2 +- .../xmlquery/ast/EmptyOrderDeclNode.java | 2 +- .../xmlquery/ast/EmptySequenceTypeNode.java | 2 +- .../vxquery/xmlquery/ast/EnclosedExprNode.java | 2 +- .../apache/vxquery/xmlquery/ast/ExprNode.java | 2 +- .../vxquery/xmlquery/ast/ExtensionExprNode.java | 2 +- .../vxquery/xmlquery/ast/FLWORClauseNode.java | 2 +- .../vxquery/xmlquery/ast/FLWORExprNode.java | 2 +- .../vxquery/xmlquery/ast/FTOptionDeclNode.java | 2 +- .../vxquery/xmlquery/ast/FilterExprNode.java | 2 +- .../vxquery/xmlquery/ast/ForClauseNode.java | 2 +- .../vxquery/xmlquery/ast/ForVarDeclNode.java | 2 +- .../vxquery/xmlquery/ast/FunctionDeclNode.java | 2 +- .../vxquery/xmlquery/ast/FunctionExprNode.java | 2 +- .../apache/vxquery/xmlquery/ast/IfExprNode.java | 2 +- .../vxquery/xmlquery/ast/InfixExprNode.java | 2 +- .../vxquery/xmlquery/ast/ItemTestNode.java | 2 +- .../vxquery/xmlquery/ast/ItemTypeNode.java | 2 +- .../vxquery/xmlquery/ast/LetClauseNode.java | 2 +- .../vxquery/xmlquery/ast/LetVarDeclNode.java | 2 +- .../vxquery/xmlquery/ast/LibraryModuleNode.java | 2 +- .../vxquery/xmlquery/ast/LiteralNode.java | 2 +- .../vxquery/xmlquery/ast/MainModuleNode.java | 2 +- .../vxquery/xmlquery/ast/ModuleDeclNode.java | 2 +- .../vxquery/xmlquery/ast/ModuleImportNode.java | 2 +- .../apache/vxquery/xmlquery/ast/ModuleNode.java | 2 +- .../apache/vxquery/xmlquery/ast/NCNameNode.java | 2 +- .../vxquery/xmlquery/ast/NameTestNode.java | 2 +- .../vxquery/xmlquery/ast/NamespaceDeclNode.java | 2 +- .../vxquery/xmlquery/ast/OptionDeclNode.java | 2 +- .../vxquery/xmlquery/ast/OrderSpecNode.java | 2 +- .../vxquery/xmlquery/ast/OrderbyClauseNode.java | 2 +- .../vxquery/xmlquery/ast/OrderedExprNode.java | 2 +- .../xmlquery/ast/OrderingModeDeclNode.java | 2 +- .../apache/vxquery/xmlquery/ast/PITestNode.java | 2 +- .../apache/vxquery/xmlquery/ast/ParamNode.java | 2 +- .../xmlquery/ast/ParenthesizedExprNode.java | 2 +- .../vxquery/xmlquery/ast/PathExprNode.java | 2 +- .../apache/vxquery/xmlquery/ast/PragmaNode.java | 2 +- .../apache/vxquery/xmlquery/ast/PrologNode.java | 2 +- .../apache/vxquery/xmlquery/ast/QNameNode.java | 2 +- .../xmlquery/ast/QuantifiedExprNode.java | 2 +- .../xmlquery/ast/QuantifiedVarDeclNode.java | 2 +- .../vxquery/xmlquery/ast/QueryBodyNode.java | 2 +- .../xmlquery/ast/RelativePathExprNode.java | 2 +- .../ast/SQuotedAttributeContentNode.java | 2 +- .../xmlquery/ast/SchemaAttributeTestNode.java | 2 +- .../xmlquery/ast/SchemaElementTestNode.java | 2 +- .../vxquery/xmlquery/ast/SchemaImportNode.java | 2 +- .../vxquery/xmlquery/ast/SequenceTypeNode.java | 2 +- .../vxquery/xmlquery/ast/SingleTypeNode.java | 2 +- .../vxquery/xmlquery/ast/TextTestNode.java | 2 +- .../xmlquery/ast/TextualNodeContentNode.java | 2 +- .../vxquery/xmlquery/ast/TypeDeclNode.java | 2 +- .../vxquery/xmlquery/ast/TypeExprNode.java | 2 +- .../xmlquery/ast/TypeswitchExprNode.java | 2 +- .../vxquery/xmlquery/ast/UnaryExprNode.java | 2 +- .../vxquery/xmlquery/ast/UnorderedExprNode.java | 2 +- .../vxquery/xmlquery/ast/ValidateExprNode.java | 2 +- .../vxquery/xmlquery/ast/VarDeclNode.java | 2 +- .../apache/vxquery/xmlquery/ast/VarRefNode.java | 2 +- .../vxquery/xmlquery/ast/VersionDeclNode.java | 2 +- .../vxquery/xmlquery/ast/WhereClauseNode.java | 2 +- .../apache/vxquery/xmlquery/query/Module.java | 6 +- .../query/NoopXQueryCompilationListener.java | 2 +- .../vxquery/xmlquery/query/PrologVariable.java | 2 +- .../query/VXQueryCompilationListener.java | 10 +- .../xmlquery/query/XMLQueryCompiler.java | 64 +++---- .../vxquery/xmlquery/query/XMLQueryParser.java | 2 +- .../xmlquery/query/XMLQueryTypeChecker.java | 2 +- .../query/XQueryCompilationListener.java | 2 +- .../vxquery/xmlquery/query/XQueryConstants.java | 2 +- .../translator/VXQueryPositionWriter.java | 5 +- .../xmlquery/translator/XMLQueryTranslator.java | 175 ++++++++++--------- .../src/main/xslt/generate-fn-defns.xsl | 6 +- .../src/main/xslt/generate-op-defns.xsl | 6 +- .../xmlquery/query/SimpleXQueryTest.java | 2 +- vxquery-server/pom.xml | 8 +- .../vxquery/cli/VXQueryClusterShutdown.java | 4 +- vxquery-xtest/pom.xml | 10 +- .../vxquery/xtest/AbstractTestCaseFactory.java | 2 +- .../apache/vxquery/xtest/ExpectedResult.java | 2 +- .../vxquery/xtest/HTMLFileReporterImpl.java | 2 +- .../vxquery/xtest/LineFileReporterImpl.java | 2 +- .../java/org/apache/vxquery/xtest/Main.java | 2 +- .../apache/vxquery/xtest/ResultReporter.java | 2 +- .../vxquery/xtest/ServletReporterImpl.java | 2 +- .../java/org/apache/vxquery/xtest/TestCase.java | 2 +- .../apache/vxquery/xtest/TestCaseFactory.java | 2 +- .../apache/vxquery/xtest/TestCaseResult.java | 2 +- .../org/apache/vxquery/xtest/TestRunner.java | 56 +++--- .../apache/vxquery/xtest/TestRunnerFactory.java | 2 +- .../vxquery/xtest/XMLFileReporterImpl.java | 2 +- .../java/org/apache/vxquery/xtest/XTest.java | 2 +- .../org/apache/vxquery/xtest/XTestOptions.java | 2 +- .../vxquery/xtest/util/DiskPerformance.java | 6 +- .../vxquery/xtest/JUnitTestCaseFactory.java | 2 +- 597 files changed, 2619 insertions(+), 2622 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1862890..f6a75cd 100644 --- a/pom.xml +++ b/pom.xml @@ -187,31 +187,31 @@ </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-client</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-common</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-compiler</artifactId> <version>${hyracks.version}</version> </dependency> @@ -223,55 +223,55 @@ </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-common</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-core</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-data</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-rewriter</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-runtime</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-data-std</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-common</artifactId> <version>${hyracks.version}</version> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> <version>${hyracks.version}</version> </dependency> @@ -459,15 +459,15 @@ </plugin> </reportPlugins> </configuration> - <executions> - <execution> + <executions> + <execution> <id>attach-site</id> <phase>prepare-package</phase> <goals> <goal>jar</goal> - </goals> - </execution> - </executions> + </goals> + </execution> + </executions> </plugin> --> <plugin> @@ -530,7 +530,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <hyracks.version>0.2.15</hyracks.version> + <hyracks.version>0.2.16-incubating</hyracks.version> <apache-rat-plugin.version>0.11</apache-rat-plugin.version> </properties> http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-cli/pom.xml ---------------------------------------------------------------------- diff --git a/vxquery-cli/pom.xml b/vxquery-cli/pom.xml index 620a4a8..7bf1ff9 100644 --- a/vxquery-cli/pom.xml +++ b/vxquery-cli/pom.xml @@ -88,42 +88,42 @@ </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-client</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-common</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-core</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-common</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java ---------------------------------------------------------------------- diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java index 0e88539..b25eff9 100644 --- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java +++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; import java.io.StringReader; -import java.nio.ByteBuffer; import java.nio.file.Files; import java.util.ArrayList; import java.util.Date; @@ -30,6 +29,25 @@ import java.util.List; import java.util.Map; import org.apache.commons.io.FileUtils; +import org.apache.hyracks.api.client.HyracksConnection; +import org.apache.hyracks.api.client.IHyracksClientConnection; +import org.apache.hyracks.api.client.NodeControllerInfo; +import org.apache.hyracks.api.comm.IFrame; +import org.apache.hyracks.api.comm.IFrameTupleAccessor; +import org.apache.hyracks.api.comm.VSizeFrame; +import org.apache.hyracks.api.dataset.IHyracksDataset; +import org.apache.hyracks.api.dataset.IHyracksDatasetReader; +import org.apache.hyracks.api.dataset.ResultSetId; +import org.apache.hyracks.api.job.JobFlag; +import org.apache.hyracks.api.job.JobId; +import org.apache.hyracks.api.job.JobSpecification; +import org.apache.hyracks.client.dataset.HyracksDataset; +import org.apache.hyracks.control.cc.ClusterControllerService; +import org.apache.hyracks.control.common.controllers.CCConfig; +import org.apache.hyracks.control.common.controllers.NCConfig; +import org.apache.hyracks.control.nc.NodeControllerService; +import org.apache.hyracks.control.nc.resources.memory.FrameManager; +import org.apache.hyracks.dataflow.common.comm.io.ResultFrameTupleAccessor; import org.apache.vxquery.compiler.CompilerControlBlock; import org.apache.vxquery.compiler.algebricks.VXQueryGlobalDataFactory; import org.apache.vxquery.context.DynamicContext; @@ -45,23 +63,6 @@ import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.Option; -import edu.uci.ics.hyracks.api.client.HyracksConnection; -import edu.uci.ics.hyracks.api.client.IHyracksClientConnection; -import edu.uci.ics.hyracks.api.client.NodeControllerInfo; -import edu.uci.ics.hyracks.api.comm.IFrameTupleAccessor; -import edu.uci.ics.hyracks.api.dataset.IHyracksDataset; -import edu.uci.ics.hyracks.api.dataset.IHyracksDatasetReader; -import edu.uci.ics.hyracks.api.dataset.ResultSetId; -import edu.uci.ics.hyracks.api.job.JobFlag; -import edu.uci.ics.hyracks.api.job.JobId; -import edu.uci.ics.hyracks.api.job.JobSpecification; -import edu.uci.ics.hyracks.client.dataset.HyracksDataset; -import edu.uci.ics.hyracks.control.cc.ClusterControllerService; -import edu.uci.ics.hyracks.control.common.controllers.CCConfig; -import edu.uci.ics.hyracks.control.common.controllers.NCConfig; -import edu.uci.ics.hyracks.control.nc.NodeControllerService; -import edu.uci.ics.hyracks.dataflow.common.comm.io.ResultFrameTupleAccessor; - public class VXQuery { private final CmdLineOptions opts; @@ -266,15 +267,16 @@ public class VXQuery { JobId jobId = hcc.startJob(spec, EnumSet.of(JobFlag.PROFILE_RUNTIME)); - ByteBuffer buffer = ByteBuffer.allocate(spec.getFrameSize()); + // ByteBuffer buffer = ByteBuffer.allocate(spec.getFrameSize()); + FrameManager resultDisplayFrameMgr = new FrameManager(spec.getFrameSize()); + IFrame frame = new VSizeFrame(resultDisplayFrameMgr); IHyracksDatasetReader reader = hds.createReader(jobId, resultSetId); - IFrameTupleAccessor frameTupleAccessor = new ResultFrameTupleAccessor(spec.getFrameSize()); - buffer.clear(); + IFrameTupleAccessor frameTupleAccessor = new ResultFrameTupleAccessor(); - while (reader.read(buffer) > 0) { - buffer.clear(); - writer.print(ResultUtils.getStringFromBuffer(buffer, frameTupleAccessor)); + while (reader.read(frame) > 0) { + writer.print(ResultUtils.getStringFromBuffer(frame.getBuffer(), frameTupleAccessor)); writer.flush(); + frame.getBuffer().clear(); } hcc.waitForCompletion(jobId); http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/pom.xml ---------------------------------------------------------------------- diff --git a/vxquery-core/pom.xml b/vxquery-core/pom.xml index 968e5c7..59cc987 100644 --- a/vxquery-core/pom.xml +++ b/vxquery-core/pom.xml @@ -179,32 +179,32 @@ </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-compiler</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-data</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-data-std</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-common</artifactId> </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-dataflow-std</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/collations/CodepointCollation.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/collations/CodepointCollation.java b/vxquery-core/src/main/java/org/apache/vxquery/collations/CodepointCollation.java index 12291fe..c50ff56 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/collations/CodepointCollation.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/collations/CodepointCollation.java @@ -93,4 +93,4 @@ public class CodepointCollation implements Collation { public boolean supportsStringMatching() { return true; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/collations/Collation.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/collations/Collation.java b/vxquery-core/src/main/java/org/apache/vxquery/collations/Collation.java index 51debb0..e8cb40f 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/collations/Collation.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/collations/Collation.java @@ -32,4 +32,4 @@ public interface Collation { public CharSequence substringBefore(CharSequence cs1, CharSequence cs2); public CharSequence substringAfter(CharSequence cs1, CharSequence cs2); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/CompilerControlBlock.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/CompilerControlBlock.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/CompilerControlBlock.java index ab58442..efc2ada 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/CompilerControlBlock.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/CompilerControlBlock.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.vxquery.context.StaticContext; -import edu.uci.ics.hyracks.api.dataset.ResultSetId; +import org.apache.hyracks.api.dataset.ResultSetId; public class CompilerControlBlock { private final StaticContext ctx; http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryBooleanInspectorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryBooleanInspectorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryBooleanInspectorFactory.java index afb4d58..09860d6 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryBooleanInspectorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryBooleanInspectorFactory.java @@ -19,10 +19,10 @@ package org.apache.vxquery.compiler.algebricks; import org.apache.vxquery.datamodel.accessors.TaggedValuePointable; import org.apache.vxquery.datamodel.values.ValueTag; -import edu.uci.ics.hyracks.algebricks.data.IBinaryBooleanInspector; -import edu.uci.ics.hyracks.algebricks.data.IBinaryBooleanInspectorFactory; -import edu.uci.ics.hyracks.api.context.IHyracksTaskContext; -import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable; +import org.apache.hyracks.algebricks.data.IBinaryBooleanInspector; +import org.apache.hyracks.algebricks.data.IBinaryBooleanInspectorFactory; +import org.apache.hyracks.api.context.IHyracksTaskContext; +import org.apache.hyracks.data.std.primitive.BooleanPointable; public class VXQueryBinaryBooleanInspectorFactory implements IBinaryBooleanInspectorFactory { private static final long serialVersionUID = 1L; @@ -41,4 +41,4 @@ public class VXQueryBinaryBooleanInspectorFactory implements IBinaryBooleanInspe } }; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryIntegerInspectorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryIntegerInspectorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryIntegerInspectorFactory.java index ccab60c..2979c1f 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryIntegerInspectorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryBinaryIntegerInspectorFactory.java @@ -19,10 +19,10 @@ package org.apache.vxquery.compiler.algebricks; import org.apache.vxquery.datamodel.accessors.TaggedValuePointable; import org.apache.vxquery.datamodel.values.ValueTag; -import edu.uci.ics.hyracks.algebricks.data.IBinaryIntegerInspector; -import edu.uci.ics.hyracks.algebricks.data.IBinaryIntegerInspectorFactory; -import edu.uci.ics.hyracks.api.context.IHyracksTaskContext; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.algebricks.data.IBinaryIntegerInspector; +import org.apache.hyracks.algebricks.data.IBinaryIntegerInspectorFactory; +import org.apache.hyracks.api.context.IHyracksTaskContext; +import org.apache.hyracks.data.std.primitive.IntegerPointable; public class VXQueryBinaryIntegerInspectorFactory implements IBinaryIntegerInspectorFactory { private static final long serialVersionUID = 1L; @@ -41,4 +41,4 @@ public class VXQueryBinaryIntegerInspectorFactory implements IBinaryIntegerInspe } }; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java index 10da31e..2643dc5 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryComparatorFactoryProvider.java @@ -18,10 +18,10 @@ package org.apache.vxquery.compiler.algebricks; import org.apache.vxquery.datamodel.accessors.TaggedValuePointable; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.data.IBinaryComparatorFactoryProvider; -import edu.uci.ics.hyracks.api.dataflow.value.IBinaryComparator; -import edu.uci.ics.hyracks.api.dataflow.value.IBinaryComparatorFactory; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.data.IBinaryComparatorFactoryProvider; +import org.apache.hyracks.api.dataflow.value.IBinaryComparator; +import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory; public class VXQueryComparatorFactoryProvider implements IBinaryComparatorFactoryProvider { @Override @@ -58,4 +58,4 @@ public class VXQueryComparatorFactoryProvider implements IBinaryComparatorFactor }; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryConstantValue.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryConstantValue.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryConstantValue.java index 1cbe74e..e105546 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryConstantValue.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryConstantValue.java @@ -19,7 +19,7 @@ package org.apache.vxquery.compiler.algebricks; import org.apache.commons.codec.binary.Hex; import org.apache.vxquery.types.SequenceType; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue; +import org.apache.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue; public class VXQueryConstantValue implements IAlgebricksConstantValue { private final SequenceType type; @@ -61,4 +61,4 @@ public class VXQueryConstantValue implements IAlgebricksConstantValue { .append("])"); return buffer.toString(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java index bfafdae..1246141 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryExpressionRuntimeProvider.java @@ -23,29 +23,29 @@ import org.apache.vxquery.datamodel.values.XDMConstants; import org.apache.vxquery.exceptions.SystemException; import org.apache.vxquery.functions.Function; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionRuntimeProvider; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.StatefulFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.IOperatorSchema; -import edu.uci.ics.hyracks.algebricks.core.jobgen.impl.JobGenContext; -import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory; -import edu.uci.ics.hyracks.algebricks.runtime.base.ICopySerializableAggregateFunctionFactory; -import edu.uci.ics.hyracks.algebricks.runtime.base.IRunningAggregateEvaluatorFactory; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory; -import edu.uci.ics.hyracks.algebricks.runtime.evaluators.ConstantEvaluatorFactory; -import edu.uci.ics.hyracks.algebricks.runtime.evaluators.TupleFieldEvaluatorFactory; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue; +import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionRuntimeProvider; +import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment; +import org.apache.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.StatefulFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.IOperatorSchema; +import org.apache.hyracks.algebricks.core.jobgen.impl.JobGenContext; +import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.ICopySerializableAggregateFunctionFactory; +import org.apache.hyracks.algebricks.runtime.base.IRunningAggregateEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.evaluators.ConstantEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.evaluators.TupleFieldEvaluatorFactory; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.primitive.BooleanPointable; +import org.apache.hyracks.data.std.primitive.VoidPointable; public class VXQueryExpressionRuntimeProvider implements IExpressionRuntimeProvider { @Override @@ -145,4 +145,4 @@ public class VXQueryExpressionRuntimeProvider implements IExpressionRuntimeProvi throw new AlgebricksException(e); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryGlobalDataFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryGlobalDataFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryGlobalDataFactory.java index 07a210f..4bb58f8 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryGlobalDataFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryGlobalDataFactory.java @@ -18,8 +18,8 @@ package org.apache.vxquery.compiler.algebricks; import org.apache.vxquery.context.IDynamicContextFactory; -import edu.uci.ics.hyracks.api.context.IHyracksJobletContext; -import edu.uci.ics.hyracks.api.job.IGlobalJobDataFactory; +import org.apache.hyracks.api.context.IHyracksJobletContext; +import org.apache.hyracks.api.job.IGlobalJobDataFactory; public class VXQueryGlobalDataFactory implements IGlobalJobDataFactory { private static final long serialVersionUID = 1L; @@ -34,4 +34,4 @@ public class VXQueryGlobalDataFactory implements IGlobalJobDataFactory { public Object createGlobalJobData(IHyracksJobletContext ctx) { return dcf.createDynamicContext(ctx); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryNullWriterFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryNullWriterFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryNullWriterFactory.java index 7fe21d5..f0220dd 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryNullWriterFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryNullWriterFactory.java @@ -21,10 +21,10 @@ import java.io.IOException; import org.apache.vxquery.datamodel.values.XDMConstants; -import edu.uci.ics.hyracks.api.dataflow.value.INullWriter; -import edu.uci.ics.hyracks.api.dataflow.value.INullWriterFactory; -import edu.uci.ics.hyracks.api.exceptions.HyracksDataException; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.api.dataflow.value.INullWriter; +import org.apache.hyracks.api.dataflow.value.INullWriterFactory; +import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.data.std.primitive.VoidPointable; public class VXQueryNullWriterFactory implements INullWriterFactory { private static final long serialVersionUID = 1L; @@ -44,4 +44,4 @@ public class VXQueryNullWriterFactory implements INullWriterFactory { } }; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java index 8089775..4a2dc4c 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactory.java @@ -18,8 +18,8 @@ package org.apache.vxquery.compiler.algebricks; import org.apache.vxquery.serializer.XMLSerializer; -import edu.uci.ics.hyracks.algebricks.data.IPrinter; -import edu.uci.ics.hyracks.algebricks.data.IPrinterFactory; +import org.apache.hyracks.algebricks.data.IPrinter; +import org.apache.hyracks.algebricks.data.IPrinterFactory; public class VXQueryPrinterFactory implements IPrinterFactory { private static final long serialVersionUID = 1L; @@ -28,4 +28,4 @@ public class VXQueryPrinterFactory implements IPrinterFactory { public IPrinter createPrinter() { return new XMLSerializer(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactoryProvider.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactoryProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactoryProvider.java index b781239..65ef917 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactoryProvider.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/VXQueryPrinterFactoryProvider.java @@ -16,9 +16,9 @@ */ package org.apache.vxquery.compiler.algebricks; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.data.IPrinterFactory; -import edu.uci.ics.hyracks.algebricks.data.IPrinterFactoryProvider; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.data.IPrinterFactory; +import org.apache.hyracks.algebricks.data.IPrinterFactoryProvider; public class VXQueryPrinterFactoryProvider implements IPrinterFactoryProvider { public static final IPrinterFactoryProvider INSTANCE = new VXQueryPrinterFactoryProvider(); @@ -28,4 +28,4 @@ public class VXQueryPrinterFactoryProvider implements IPrinterFactoryProvider { return new VXQueryPrinterFactory(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java index e6d8dd1..02842b3 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/algebricks/prettyprint/VXQueryLogicalExpressionPrettyPrintVisitor.java @@ -28,21 +28,21 @@ import org.apache.vxquery.functions.BuiltinOperators; import org.apache.vxquery.serializer.XMLSerializer; import org.apache.vxquery.types.SequenceType; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.StatefulFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo; -import edu.uci.ics.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVisitor; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag; +import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.AggregateFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.IAlgebricksConstantValue; +import org.apache.hyracks.algebricks.core.algebra.expressions.ScalarFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.StatefulFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.UnnestingFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; +import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; +import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo; +import org.apache.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVisitor; +import org.apache.hyracks.data.std.primitive.IntegerPointable; public class VXQueryLogicalExpressionPrettyPrintVisitor implements ILogicalExpressionVisitor<String, Integer> { http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java index c3d0358..075fb3e 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java @@ -45,47 +45,47 @@ import org.apache.vxquery.compiler.rewriter.rules.algebricksalternatives.Extract import org.apache.vxquery.compiler.rewriter.rules.algebricksalternatives.InlineNestedVariablesRule; import org.apache.vxquery.compiler.rewriter.rules.algebricksalternatives.MoveFreeVariableOperatorOutOfSubplanRule; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.HeuristicOptimizer; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.BreakSelectIntoConjunctsRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.ComplexJoinInferenceRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.ComplexUnnestToProductRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.ConsolidateAssignsRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.ConsolidateSelectsRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.CopyLimitDownRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.EliminateGroupByEmptyKeyRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.EliminateSubplanRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.EliminateSubplanWithInputCardinalityOneRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.EnforceStructuralPropertiesRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.ExtractCommonOperatorsRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.ExtractGbyExpressionsRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.FactorRedundantGroupAndDecorVarsRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.InferTypesRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.InlineAssignIntoAggregateRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.InlineVariablesRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.InsertOuterJoinRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroJoinInsideSubplanRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceAggregateCombinerRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceGroupByCombinerRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceGroupByForSubplanRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.IntroduceProjectsRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.IsolateHyracksOperatorsRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.NestedSubplanToJoinRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.PullSelectOutOfEqJoin; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushMapOperatorDownThroughProductRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushProjectDownRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushProjectIntoDataSourceScanRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushSelectDownRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushSelectIntoJoinRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushSubplanIntoGroupByRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.PushSubplanWithAggregateDownThroughProductRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.ReinferAllTypesRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.RemoveRedundantVariablesRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.RemoveUnusedAssignAndAggregateRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.SetAlgebricksPhysicalOperatorsRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.SetExecutionModeRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.SimpleUnnestToProductRule; -import edu.uci.ics.hyracks.algebricks.rewriter.rules.SubplanOutOfGroupRule; +import org.apache.hyracks.algebricks.core.rewriter.base.HeuristicOptimizer; +import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; +import org.apache.hyracks.algebricks.rewriter.rules.BreakSelectIntoConjunctsRule; +import org.apache.hyracks.algebricks.rewriter.rules.ComplexJoinInferenceRule; +import org.apache.hyracks.algebricks.rewriter.rules.ComplexUnnestToProductRule; +import org.apache.hyracks.algebricks.rewriter.rules.ConsolidateAssignsRule; +import org.apache.hyracks.algebricks.rewriter.rules.ConsolidateSelectsRule; +import org.apache.hyracks.algebricks.rewriter.rules.CopyLimitDownRule; +import org.apache.hyracks.algebricks.rewriter.rules.EliminateGroupByEmptyKeyRule; +import org.apache.hyracks.algebricks.rewriter.rules.EliminateSubplanRule; +import org.apache.hyracks.algebricks.rewriter.rules.EliminateSubplanWithInputCardinalityOneRule; +import org.apache.hyracks.algebricks.rewriter.rules.EnforceStructuralPropertiesRule; +import org.apache.hyracks.algebricks.rewriter.rules.ExtractCommonOperatorsRule; +import org.apache.hyracks.algebricks.rewriter.rules.ExtractGbyExpressionsRule; +import org.apache.hyracks.algebricks.rewriter.rules.FactorRedundantGroupAndDecorVarsRule; +import org.apache.hyracks.algebricks.rewriter.rules.InferTypesRule; +import org.apache.hyracks.algebricks.rewriter.rules.InlineAssignIntoAggregateRule; +import org.apache.hyracks.algebricks.rewriter.rules.InlineVariablesRule; +import org.apache.hyracks.algebricks.rewriter.rules.InsertOuterJoinRule; +import org.apache.hyracks.algebricks.rewriter.rules.IntroJoinInsideSubplanRule; +import org.apache.hyracks.algebricks.rewriter.rules.IntroduceAggregateCombinerRule; +import org.apache.hyracks.algebricks.rewriter.rules.IntroduceGroupByCombinerRule; +import org.apache.hyracks.algebricks.rewriter.rules.IntroduceGroupByForSubplanRule; +import org.apache.hyracks.algebricks.rewriter.rules.IntroduceProjectsRule; +import org.apache.hyracks.algebricks.rewriter.rules.IsolateHyracksOperatorsRule; +import org.apache.hyracks.algebricks.rewriter.rules.NestedSubplanToJoinRule; +import org.apache.hyracks.algebricks.rewriter.rules.PullSelectOutOfEqJoin; +import org.apache.hyracks.algebricks.rewriter.rules.PushMapOperatorDownThroughProductRule; +import org.apache.hyracks.algebricks.rewriter.rules.PushProjectDownRule; +import org.apache.hyracks.algebricks.rewriter.rules.PushProjectIntoDataSourceScanRule; +import org.apache.hyracks.algebricks.rewriter.rules.PushSelectDownRule; +import org.apache.hyracks.algebricks.rewriter.rules.PushSelectIntoJoinRule; +import org.apache.hyracks.algebricks.rewriter.rules.PushSubplanIntoGroupByRule; +import org.apache.hyracks.algebricks.rewriter.rules.PushSubplanWithAggregateDownThroughProductRule; +import org.apache.hyracks.algebricks.rewriter.rules.ReinferAllTypesRule; +import org.apache.hyracks.algebricks.rewriter.rules.RemoveRedundantVariablesRule; +import org.apache.hyracks.algebricks.rewriter.rules.RemoveUnusedAssignAndAggregateRule; +import org.apache.hyracks.algebricks.rewriter.rules.SetAlgebricksPhysicalOperatorsRule; +import org.apache.hyracks.algebricks.rewriter.rules.SetExecutionModeRule; +import org.apache.hyracks.algebricks.rewriter.rules.SimpleUnnestToProductRule; +import org.apache.hyracks.algebricks.rewriter.rules.SubplanOutOfGroupRule; public class RewriteRuleset { /** @@ -327,4 +327,4 @@ public class RewriteRuleset { prepareForJobGenRewrites.add(new SetExecutionModeRule()); return prepareForJobGenRewrites; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java index b2a6f1a..eef9495 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/VXQueryOptimizationContext.java @@ -21,14 +21,14 @@ import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.cardinalit import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.documentorder.DocumentOrder; import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.uniquenodes.UniqueNodes; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionEvalSizeComputer; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionTypeComputer; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IMergeAggregationExpressionFactory; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.INullableTypeComputer; -import edu.uci.ics.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.AlgebricksOptimizationContext; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.PhysicalOptimizationConfig; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionEvalSizeComputer; +import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionTypeComputer; +import org.apache.hyracks.algebricks.core.algebra.expressions.IMergeAggregationExpressionFactory; +import org.apache.hyracks.algebricks.core.algebra.expressions.INullableTypeComputer; +import org.apache.hyracks.algebricks.core.algebra.prettyprint.LogicalOperatorPrettyPrintVisitor; +import org.apache.hyracks.algebricks.core.rewriter.base.AlgebricksOptimizationContext; +import org.apache.hyracks.algebricks.core.rewriter.base.PhysicalOptimizationConfig; public class VXQueryOptimizationContext extends AlgebricksOptimizationContext { @@ -95,4 +95,4 @@ public class VXQueryOptimizationContext extends AlgebricksOptimizationContext { this.uniqueNodesOperatorVariableMap.put(op, variableMap); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java index 717914a..f343b41 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractCollectionRule.java @@ -31,21 +31,21 @@ import org.apache.vxquery.types.BuiltinTypeRegistry; import org.apache.vxquery.types.Quantifier; import org.apache.vxquery.types.SequenceType; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalExpressionTag; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalOperatorTag; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.ConstantExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; -import edu.uci.ics.hyracks.dataflow.common.comm.util.ByteBufferInputStream; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +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; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag; +import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression; +import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator; +import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream; public abstract class AbstractCollectionRule implements IAlgebraicRewriteRule { final ByteBufferInputStream bbis = new ByteBufferInputStream(); http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractRemoveRedundantTypeExpressionsRule.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractRemoveRedundantTypeExpressionsRule.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractRemoveRedundantTypeExpressionsRule.java index 5d83be7..2430b5d 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractRemoveRedundantTypeExpressionsRule.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/rules/AbstractRemoveRedundantTypeExpressionsRule.java @@ -26,13 +26,13 @@ import org.apache.vxquery.context.RootStaticContextImpl; import org.apache.vxquery.context.StaticContextImpl; import org.apache.vxquery.types.SequenceType; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalOperator; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.IOptimizationContext; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; -import edu.uci.ics.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +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; +import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression; +import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; +import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule; public abstract class AbstractRemoveRedundantTypeExpressionsRule implements IAlgebraicRewriteRule { final StaticContextImpl dCtx = new StaticContextImpl(RootStaticContextImpl.INSTANCE);
