http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java index 697d76c..39b12b9 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java @@ -65,4 +65,4 @@ public class SystemException extends Exception { public ErrorCode getCode() { return code; } -} \ 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/exceptions/SystemExceptionFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemExceptionFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemExceptionFactory.java index d26f5af..15dcc61 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemExceptionFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemExceptionFactory.java @@ -24,4 +24,4 @@ public interface SystemExceptionFactory { public SystemException createException(ErrorCode eCode); public SystemException createException(ErrorCode eCode, SourceLocation location); -} \ 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/exceptions/VXQueryDataException.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java index 79a37af..e41872c 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java @@ -18,7 +18,7 @@ package org.apache.vxquery.exceptions; import java.io.File; -import edu.uci.ics.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.api.exceptions.HyracksDataException; public class VXQueryDataException extends HyracksDataException { http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java index 419b6ed..0e7da5d 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java @@ -18,4 +18,4 @@ package org.apache.vxquery.exceptions; public interface WarningReporter { public void reportWarning(Exception 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/functions/BuiltinFunction.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/BuiltinFunction.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/BuiltinFunction.java index c85be26..1b002be 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/functions/BuiltinFunction.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/BuiltinFunction.java @@ -34,4 +34,4 @@ public class BuiltinFunction extends Function { public boolean useContextImplicitly() { return implicitContext; } -} \ 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/functions/ExternalFunction.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/ExternalFunction.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/ExternalFunction.java index 9d0891d..e80826d 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/functions/ExternalFunction.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/ExternalFunction.java @@ -32,4 +32,4 @@ public class ExternalFunction extends Function { public boolean useContextImplicitly() { return false; } -} \ 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/functions/Function.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/Function.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/Function.java index c725743..1305536 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/functions/Function.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/Function.java @@ -26,11 +26,11 @@ import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.uniquenode import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; -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.runtime.base.IAggregateEvaluatorFactory; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory; +import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; +import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo; +import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory; public abstract class Function implements IFunctionInfo { private static final String VXQUERY = "vxquery"; http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java index 1819129..ddce15c 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java @@ -32,4 +32,4 @@ public class Operator extends Function { public boolean useContextImplicitly() { return false; } -} \ 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/functions/Signature.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java index 609e005..8604212 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java @@ -71,4 +71,4 @@ public final class Signature { public void serialize(StringBuffer buffer) { } -} \ 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/functions/UserDefinedXQueryFunction.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/UserDefinedXQueryFunction.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/UserDefinedXQueryFunction.java index 63b8c12..6d00845 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/functions/UserDefinedXQueryFunction.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/UserDefinedXQueryFunction.java @@ -18,7 +18,7 @@ import javax.xml.namespace.QName; import org.apache.vxquery.context.XQueryVariable; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalPlan; public class UserDefinedXQueryFunction extends Function { private XQueryVariable[] params; @@ -54,4 +54,4 @@ public class UserDefinedXQueryFunction extends Function { public boolean useContextImplicitly() { return false; } -} \ 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/metadata/QueryResultDataSink.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultDataSink.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultDataSink.java index 9fc639f..8286d1b 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultDataSink.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultDataSink.java @@ -16,11 +16,11 @@ */ package org.apache.vxquery.metadata; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSink; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.FileSplitDomain; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.IPartitioningProperty; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty; -import edu.uci.ics.hyracks.dataflow.std.file.FileSplit; +import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSink; +import org.apache.hyracks.algebricks.core.algebra.properties.FileSplitDomain; +import org.apache.hyracks.algebricks.core.algebra.properties.IPartitioningProperty; +import org.apache.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty; +import org.apache.hyracks.dataflow.std.file.FileSplit; public class QueryResultDataSink implements IDataSink { private final FileSplit[] fileSplits; @@ -49,4 +49,4 @@ public class QueryResultDataSink implements IDataSink { public FileSplit[] getFileSplits() { return fileSplits; } -} \ 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/metadata/QueryResultSetDataSink.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultSetDataSink.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultSetDataSink.java index 1e4e781..80166e7 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultSetDataSink.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultSetDataSink.java @@ -16,11 +16,11 @@ */ package org.apache.vxquery.metadata; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSink; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.IPartitioningProperty; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.ResultSetDomain; -import edu.uci.ics.hyracks.api.dataset.ResultSetId; +import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSink; +import org.apache.hyracks.algebricks.core.algebra.properties.IPartitioningProperty; +import org.apache.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty; +import org.apache.hyracks.algebricks.core.algebra.properties.ResultSetDomain; +import org.apache.hyracks.api.dataset.ResultSetId; public class QueryResultSetDataSink implements IDataSink { @@ -46,4 +46,4 @@ public class QueryResultSetDataSink implements IDataSink { public IPartitioningProperty getPartitioningProperty() { return new RandomPartitioningProperty(new ResultSetDomain()); } -} \ 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/metadata/VXQueryCollectionDataSource.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java index d17a1a9..62d1ca7 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java @@ -21,14 +21,14 @@ import java.util.List; import org.apache.vxquery.compiler.rewriter.rules.CollectionFileDomain; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSource; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSourcePropertiesProvider; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.FunctionalDependency; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.ILocalStructuralProperty; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.IPhysicalPropertiesVector; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.StructuralPropertiesVector; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable; +import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSource; +import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSourcePropertiesProvider; +import org.apache.hyracks.algebricks.core.algebra.properties.FunctionalDependency; +import org.apache.hyracks.algebricks.core.algebra.properties.ILocalStructuralProperty; +import org.apache.hyracks.algebricks.core.algebra.properties.IPhysicalPropertiesVector; +import org.apache.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty; +import org.apache.hyracks.algebricks.core.algebra.properties.StructuralPropertiesVector; public class VXQueryCollectionDataSource implements IDataSource<String> { private static final String DELIMITER = "\\|"; http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java index 8fdd1ec..d5966b8 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java @@ -25,23 +25,24 @@ import java.util.logging.Logger; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.TrueFileFilter; +import org.apache.hyracks.api.comm.IFrame; +import org.apache.hyracks.api.comm.IFrameFieldAppender; +import org.apache.hyracks.api.comm.VSizeFrame; +import org.apache.hyracks.api.context.IHyracksTaskContext; +import org.apache.hyracks.api.dataflow.IOperatorNodePushable; +import org.apache.hyracks.api.dataflow.value.IRecordDescriptorProvider; +import org.apache.hyracks.api.dataflow.value.RecordDescriptor; +import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.api.job.IOperatorDescriptorRegistry; +import org.apache.hyracks.dataflow.common.comm.io.FrameFixedFieldTupleAppender; +import org.apache.hyracks.dataflow.common.comm.io.FrameTupleAccessor; +import org.apache.hyracks.dataflow.std.base.AbstractSingleActivityOperatorDescriptor; +import org.apache.hyracks.dataflow.std.base.AbstractUnaryInputUnaryOutputOperatorNodePushable; import org.apache.vxquery.context.DynamicContext; import org.apache.vxquery.xmlparser.ITreeNodeIdProvider; import org.apache.vxquery.xmlparser.TreeNodeIdProvider; import org.apache.vxquery.xmlparser.XMLParser; -import edu.uci.ics.hyracks.api.context.IHyracksTaskContext; -import edu.uci.ics.hyracks.api.dataflow.IOperatorNodePushable; -import edu.uci.ics.hyracks.api.dataflow.value.IRecordDescriptorProvider; -import edu.uci.ics.hyracks.api.dataflow.value.RecordDescriptor; -import edu.uci.ics.hyracks.api.exceptions.HyracksDataException; -import edu.uci.ics.hyracks.api.job.IOperatorDescriptorRegistry; -import edu.uci.ics.hyracks.dataflow.common.comm.io.FrameTupleAccessor; -import edu.uci.ics.hyracks.dataflow.common.comm.io.FrameTupleAppender; -import edu.uci.ics.hyracks.dataflow.common.comm.util.FrameUtils; -import edu.uci.ics.hyracks.dataflow.std.base.AbstractSingleActivityOperatorDescriptor; -import edu.uci.ics.hyracks.dataflow.std.base.AbstractUnaryInputUnaryOutputOperatorNodePushable; - public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityOperatorDescriptor { private static final long serialVersionUID = 1L; private short dataSourceId; @@ -63,18 +64,18 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO @Override public IOperatorNodePushable createPushRuntime(IHyracksTaskContext ctx, IRecordDescriptorProvider recordDescProvider, int partition, int nPartitions) throws HyracksDataException { - final FrameTupleAccessor fta = new FrameTupleAccessor(ctx.getFrameSize(), + final FrameTupleAccessor fta = new FrameTupleAccessor( recordDescProvider.getInputRecordDescriptor(getActivityId(), 0)); final int fieldOutputCount = recordDescProvider.getOutputRecordDescriptor(getActivityId(), 0).getFieldCount(); - final ByteBuffer frame = ctx.allocateFrame(); - final FrameTupleAppender appender = new FrameTupleAppender(ctx.getFrameSize(), fieldOutputCount); + final IFrame frame = new VSizeFrame(ctx); + final IFrameFieldAppender appender = new FrameFixedFieldTupleAppender(fieldOutputCount); final short partitionId = (short) ctx.getTaskAttemptId().getTaskId().getPartition(); final ITreeNodeIdProvider nodeIdProvider = new TreeNodeIdProvider(partitionId, dataSourceId, totalDataSources); final String nodeId = ctx.getJobletContext().getApplicationContext().getNodeId(); final DynamicContext dCtx = (DynamicContext) ctx.getJobletContext().getGlobalJobData(); final String collectionName = collectionPartitions[partition % collectionPartitions.length]; - final XMLParser parser = new XMLParser(false, nodeIdProvider, nodeId, frame, appender, childSeq, + final XMLParser parser = new XMLParser(false, nodeIdProvider, nodeId, appender, childSeq, dCtx.getStaticContext()); return new AbstractUnaryInputUnaryOutputOperatorNodePushable() { @@ -101,7 +102,7 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO if (LOGGER.isLoggable(Level.FINE)) { LOGGER.fine("Starting to read XML document: " + xmlDocument.getAbsolutePath()); } - parser.parseElements(xmlDocument, writer, fta, tupleIndex); + parser.parseElements(xmlDocument, writer, tupleIndex); } } } else { @@ -118,12 +119,11 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO @Override public void close() throws HyracksDataException { // Check if needed? - fta.reset(frame); - if (fta.getTupleCount() > 0) { - FrameUtils.flushFrame(frame, writer); + if (appender.getTupleCount() > 0) { + appender.flush(writer, true); } writer.close(); } }; } -} \ 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/metadata/VXQueryIOFileFilter.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryIOFileFilter.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryIOFileFilter.java index 104f254..70070dc 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryIOFileFilter.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryIOFileFilter.java @@ -34,4 +34,4 @@ public class VXQueryIOFileFilter implements IOFileFilter { } return false; } -} \ 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/metadata/VXQueryMetadataProvider.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java index ea4bdb1..238f6d3 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java @@ -24,34 +24,34 @@ import java.util.Map; import org.apache.vxquery.context.StaticContext; -import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint; -import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.common.utils.Pair; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment; -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.metadata.IDataSink; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSource; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSourceIndex; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IMetadataProvider; -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.data.IAWriterFactory; -import edu.uci.ics.hyracks.algebricks.data.IPrinterFactory; -import edu.uci.ics.hyracks.algebricks.data.IResultSerializerFactoryProvider; -import edu.uci.ics.hyracks.algebricks.runtime.base.IPushRuntimeFactory; -import edu.uci.ics.hyracks.algebricks.runtime.serializer.ResultSerializerFactoryProvider; -import edu.uci.ics.hyracks.algebricks.runtime.writers.PrinterBasedWriterFactory; -import edu.uci.ics.hyracks.api.dataflow.IOperatorDescriptor; -import edu.uci.ics.hyracks.api.dataflow.value.IResultSerializerFactory; -import edu.uci.ics.hyracks.api.dataflow.value.ISerializerDeserializer; -import edu.uci.ics.hyracks.api.dataflow.value.RecordDescriptor; -import edu.uci.ics.hyracks.api.dataset.ResultSetId; -import edu.uci.ics.hyracks.api.job.JobSpecification; -import edu.uci.ics.hyracks.dataflow.std.result.ResultWriterOperatorDescriptor; +import org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint; +import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.common.utils.Pair; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable; +import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment; +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.metadata.IDataSink; +import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSource; +import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSourceIndex; +import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.IOperatorSchema; +import org.apache.hyracks.algebricks.core.jobgen.impl.JobGenContext; +import org.apache.hyracks.algebricks.data.IAWriterFactory; +import org.apache.hyracks.algebricks.data.IPrinterFactory; +import org.apache.hyracks.algebricks.data.IResultSerializerFactoryProvider; +import org.apache.hyracks.algebricks.runtime.base.IPushRuntimeFactory; +import org.apache.hyracks.algebricks.runtime.serializer.ResultSerializerFactoryProvider; +import org.apache.hyracks.algebricks.runtime.writers.PrinterBasedWriterFactory; +import org.apache.hyracks.api.dataflow.IOperatorDescriptor; +import org.apache.hyracks.api.dataflow.value.IResultSerializerFactory; +import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer; +import org.apache.hyracks.api.dataflow.value.RecordDescriptor; +import org.apache.hyracks.api.dataset.ResultSetId; +import org.apache.hyracks.api.job.JobSpecification; +import org.apache.hyracks.dataflow.std.result.ResultWriterOperatorDescriptor; public class VXQueryMetadataProvider implements IMetadataProvider<String, String> { private final String[] nodeList; @@ -229,4 +229,4 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String throw new UnsupportedOperationException(); } -} \ 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/result/ResultUtils.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/result/ResultUtils.java b/vxquery-core/src/main/java/org/apache/vxquery/result/ResultUtils.java index 923706e..ae7f5a1 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/result/ResultUtils.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/result/ResultUtils.java @@ -17,9 +17,9 @@ package org.apache.vxquery.result; import java.io.IOException; import java.nio.ByteBuffer; -import edu.uci.ics.hyracks.api.comm.IFrameTupleAccessor; -import edu.uci.ics.hyracks.api.exceptions.HyracksDataException; -import edu.uci.ics.hyracks.dataflow.common.comm.util.ByteBufferInputStream; +import org.apache.hyracks.api.comm.IFrameTupleAccessor; +import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream; public class ResultUtils { public static String getStringFromBuffer(ByteBuffer buffer, IFrameTupleAccessor fta) throws HyracksDataException { http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java index 4f9437b..5ec14ee 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java @@ -16,9 +16,9 @@ */ package org.apache.vxquery.runtime.factory.hashfunction; -import edu.uci.ics.hyracks.api.dataflow.value.IBinaryHashFunction; -import edu.uci.ics.hyracks.api.dataflow.value.IBinaryHashFunctionFactory; -import edu.uci.ics.hyracks.data.std.accessors.MurmurHash3BinaryHashFunctionFamily; +import org.apache.hyracks.api.dataflow.value.IBinaryHashFunction; +import org.apache.hyracks.api.dataflow.value.IBinaryHashFunctionFactory; +import org.apache.hyracks.data.std.accessors.MurmurHash3BinaryHashFunctionFamily; public class VXQueryRawBinaryHashFunctionFactory implements IBinaryHashFunctionFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/5313291c/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java index ba31783..325fb71 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java @@ -31,12 +31,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggr import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation; import org.apache.vxquery.runtime.functions.util.FunctionHelper; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public abstract class AbstractMaxMinAggregateEvaluatorFactory extends AbstractTaggedValueArgumentAggregateEvaluatorFactory { @@ -110,4 +110,4 @@ public abstract class AbstractMaxMinAggregateEvaluatorFactory extends } protected abstract AbstractValueComparisonOperation createValueComparisonOperation(); -} \ 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/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java index b2aa0b9..82d938e 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java @@ -28,12 +28,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation; import org.apache.vxquery.runtime.functions.util.FunctionHelper; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.api.context.IHyracksTaskContext; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.api.context.IHyracksTaskContext; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.primitive.VoidPointable; public abstract class AbstractMaxMinScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -87,4 +87,4 @@ public abstract class AbstractMaxMinScalarEvaluatorFactory extends AbstractTagge } protected abstract AbstractValueComparisonOperation createValueComparisonOperation(); -} \ 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/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java index 00756bf..828efd4 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgGlobalAggregateEvaluatorFactory.java @@ -30,13 +30,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggr import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory; import org.apache.vxquery.runtime.functions.util.ArithmeticHelper; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class AvgGlobalAggregateEvaluatorFactory extends AbstractTaggedValueArgumentAggregateEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -122,4 +122,4 @@ public class AvgGlobalAggregateEvaluatorFactory extends AbstractTaggedValueArgum } }; } -} \ 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/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java index 010b96f..db2aa57 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AvgLocalAggregateEvaluatorFactory.java @@ -28,12 +28,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggr import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory; import org.apache.vxquery.runtime.functions.util.ArithmeticHelper; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class AvgLocalAggregateEvaluatorFactory extends AbstractTaggedValueArgumentAggregateEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -109,4 +109,4 @@ public class AvgLocalAggregateEvaluatorFactory extends AbstractTaggedValueArgume } }; } -} \ 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/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java index 6489fe3..09a611f 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgAggregateEvaluatorFactory.java @@ -30,12 +30,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggr import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory; import org.apache.vxquery.runtime.functions.util.ArithmeticHelper; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class FnAvgAggregateEvaluatorFactory extends AbstractTaggedValueArgumentAggregateEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -109,4 +109,4 @@ public class FnAvgAggregateEvaluatorFactory extends AbstractTaggedValueArgumentA } }; } -} \ 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/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java index daa7715..9a511cd 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnAvgScalarEvaluatorFactory.java @@ -31,12 +31,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory; import org.apache.vxquery.runtime.functions.util.ArithmeticHelper; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.api.context.IHyracksTaskContext; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.api.context.IHyracksTaskContext; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class FnAvgScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -101,4 +101,4 @@ public class FnAvgScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal } }; } -} \ 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/runtime/functions/aggregate/FnCountAggregateEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountAggregateEvaluatorFactory.java index fbde38c..8c55630 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountAggregateEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountAggregateEvaluatorFactory.java @@ -24,12 +24,12 @@ import org.apache.vxquery.exceptions.SystemException; import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluator; import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class FnCountAggregateEvaluatorFactory extends AbstractTaggedValueArgumentAggregateEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -74,4 +74,4 @@ public class FnCountAggregateEvaluatorFactory extends AbstractTaggedValueArgumen }; } -} \ 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/runtime/functions/aggregate/FnCountScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountScalarEvaluatorFactory.java index c96ea6e..0912f29 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnCountScalarEvaluatorFactory.java @@ -26,12 +26,12 @@ import org.apache.vxquery.exceptions.SystemException; import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator; import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.api.context.IHyracksTaskContext; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.api.context.IHyracksTaskContext; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class FnCountScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -69,4 +69,4 @@ public class FnCountScalarEvaluatorFactory extends AbstractTaggedValueArgumentSc } }; } -} \ 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/runtime/functions/aggregate/FnMaxAggregateEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxAggregateEvaluatorFactory.java index b4af077..4a4d0bc 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxAggregateEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxAggregateEvaluatorFactory.java @@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.aggregate; import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation; import org.apache.vxquery.runtime.functions.comparison.ValueGtComparisonOperation; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; public class FnMaxAggregateEvaluatorFactory extends AbstractMaxMinAggregateEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -33,4 +33,4 @@ public class FnMaxAggregateEvaluatorFactory extends AbstractMaxMinAggregateEvalu return new ValueGtComparisonOperation(); } -} \ 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/runtime/functions/aggregate/FnMaxScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxScalarEvaluatorFactory.java index 5f7dd54..83966ec 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMaxScalarEvaluatorFactory.java @@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.aggregate; import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation; import org.apache.vxquery.runtime.functions.comparison.ValueGtComparisonOperation; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; public class FnMaxScalarEvaluatorFactory extends AbstractMaxMinScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -33,4 +33,4 @@ public class FnMaxScalarEvaluatorFactory extends AbstractMaxMinScalarEvaluatorFa return new ValueGtComparisonOperation(); } -} \ 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/runtime/functions/aggregate/FnMinAggregateEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinAggregateEvaluatorFactory.java index 06557b2..32fa553 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinAggregateEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinAggregateEvaluatorFactory.java @@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.aggregate; import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation; import org.apache.vxquery.runtime.functions.comparison.ValueLtComparisonOperation; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; public class FnMinAggregateEvaluatorFactory extends AbstractMaxMinAggregateEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -33,4 +33,4 @@ public class FnMinAggregateEvaluatorFactory extends AbstractMaxMinAggregateEvalu return new ValueLtComparisonOperation(); } -} \ 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/runtime/functions/aggregate/FnMinScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinScalarEvaluatorFactory.java index 1ff6e4b..90368db 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnMinScalarEvaluatorFactory.java @@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.aggregate; import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation; import org.apache.vxquery.runtime.functions.comparison.ValueLtComparisonOperation; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; public class FnMinScalarEvaluatorFactory extends AbstractMaxMinScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -33,4 +33,4 @@ public class FnMinScalarEvaluatorFactory extends AbstractMaxMinScalarEvaluatorFa return new ValueLtComparisonOperation(); } -} \ 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/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java index 6e96fe7..b4fdcdc 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumAggregateEvaluatorFactory.java @@ -27,12 +27,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggr import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggregateEvaluatorFactory; import org.apache.vxquery.runtime.functions.util.ArithmeticHelper; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class FnSumAggregateEvaluatorFactory extends AbstractTaggedValueArgumentAggregateEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -82,4 +82,4 @@ public class FnSumAggregateEvaluatorFactory extends AbstractTaggedValueArgumentA } }; } -} \ 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/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java index 2088e1f..635fa8a 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/FnSumScalarEvaluatorFactory.java @@ -29,13 +29,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory; import org.apache.vxquery.runtime.functions.util.ArithmeticHelper; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.api.context.IHyracksTaskContext; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.api.context.IHyracksTaskContext; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class FnSumScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -101,4 +101,4 @@ public class FnSumScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal } }; } -} \ 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/runtime/functions/arithmetic/AbstractArithmeticOperation.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticOperation.java index 51539d9..db4099b 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticOperation.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticOperation.java @@ -26,10 +26,10 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable; import org.apache.vxquery.datamodel.accessors.atomic.XSTimePointable; import org.apache.vxquery.exceptions.SystemException; -import edu.uci.ics.hyracks.data.std.primitive.DoublePointable; -import edu.uci.ics.hyracks.data.std.primitive.FloatPointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.FloatPointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.LongPointable; public abstract class AbstractArithmeticOperation { public abstract void operateDateDate(XSDatePointable datep1, XSDatePointable datep2, DynamicContext dCtx, @@ -172,4 +172,4 @@ public abstract class AbstractArithmeticOperation { public abstract void operateYMDurationYMDuration(IntegerPointable intp1, IntegerPointable intp2, DataOutput dOut) throws SystemException, IOException; -} \ 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/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java index 90e1c4e..eb253a6 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AbstractArithmeticScalarEvaluatorFactory.java @@ -26,11 +26,11 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory; import org.apache.vxquery.runtime.functions.util.ArithmeticHelper; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.api.context.IHyracksTaskContext; -import edu.uci.ics.hyracks.data.std.api.IPointable; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.api.context.IHyracksTaskContext; +import org.apache.hyracks.data.std.api.IPointable; public abstract class AbstractArithmeticScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { @@ -74,4 +74,4 @@ public abstract class AbstractArithmeticScalarEvaluatorFactory extends } protected abstract AbstractArithmeticOperation createArithmeticOperation(); -} \ 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/runtime/functions/arithmetic/AddOperation.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java index b5fdd67..d6d3b7e 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddOperation.java @@ -29,11 +29,11 @@ import org.apache.vxquery.datamodel.values.ValueTag; import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; -import edu.uci.ics.hyracks.data.std.primitive.DoublePointable; -import edu.uci.ics.hyracks.data.std.primitive.FloatPointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.FloatPointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class AddOperation extends AbstractArithmeticOperation { protected final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage(); @@ -485,4 +485,4 @@ public class AddOperation extends AbstractArithmeticOperation { decp2.setDecimal(value1, place1); return decp2.longValue(); } -} \ 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/runtime/functions/arithmetic/AddScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddScalarEvaluatorFactory.java index d701171..728bd71 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/AddScalarEvaluatorFactory.java @@ -16,7 +16,7 @@ */ package org.apache.vxquery.runtime.functions.arithmetic; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; public class AddScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -29,4 +29,4 @@ public class AddScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluator protected AbstractArithmeticOperation createArithmeticOperation() { return new AddOperation(); } -} \ 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/runtime/functions/arithmetic/DivideOperation.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java index f28c978..315c761 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideOperation.java @@ -29,11 +29,11 @@ import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; import org.apache.vxquery.runtime.functions.cast.CastToDecimalOperation; -import edu.uci.ics.hyracks.data.std.primitive.DoublePointable; -import edu.uci.ics.hyracks.data.std.primitive.FloatPointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.FloatPointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class DivideOperation extends AbstractArithmeticOperation { protected final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage(); @@ -499,4 +499,4 @@ public class DivideOperation extends AbstractArithmeticOperation { return (int) value1; } -} \ 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/runtime/functions/arithmetic/DivideScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideScalarEvaluatorFactory.java index 6caea85..df427ab 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/DivideScalarEvaluatorFactory.java @@ -16,7 +16,7 @@ */ package org.apache.vxquery.runtime.functions.arithmetic; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; public class DivideScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -29,4 +29,4 @@ public class DivideScalarEvaluatorFactory extends AbstractArithmeticScalarEvalua protected AbstractArithmeticOperation createArithmeticOperation() { return new DivideOperation(); } -} \ 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/runtime/functions/arithmetic/IntegerDivideOperation.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideOperation.java index c9854f0..3253606 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideOperation.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideOperation.java @@ -28,11 +28,11 @@ import org.apache.vxquery.datamodel.values.ValueTag; import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; -import edu.uci.ics.hyracks.data.std.primitive.DoublePointable; -import edu.uci.ics.hyracks.data.std.primitive.FloatPointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.FloatPointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class IntegerDivideOperation extends AbstractArithmeticOperation { protected final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage(); @@ -457,4 +457,4 @@ public class IntegerDivideOperation extends AbstractArithmeticOperation { throw new SystemException(ErrorCode.XPTY0004); } -} \ 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/runtime/functions/arithmetic/IntegerDivideScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideScalarEvaluatorFactory.java index 1920ce4..0ab2626 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/IntegerDivideScalarEvaluatorFactory.java @@ -16,7 +16,7 @@ */ package org.apache.vxquery.runtime.functions.arithmetic; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; public class IntegerDivideScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -29,4 +29,4 @@ public class IntegerDivideScalarEvaluatorFactory extends AbstractArithmeticScala protected AbstractArithmeticOperation createArithmeticOperation() { return new IntegerDivideOperation(); } -} \ 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/runtime/functions/arithmetic/ModOperation.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModOperation.java index 4ff2476..577b659 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModOperation.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModOperation.java @@ -28,11 +28,11 @@ import org.apache.vxquery.datamodel.values.ValueTag; import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; -import edu.uci.ics.hyracks.data.std.primitive.DoublePointable; -import edu.uci.ics.hyracks.data.std.primitive.FloatPointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.FloatPointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class ModOperation extends AbstractArithmeticOperation { protected final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage(); @@ -393,4 +393,4 @@ public class ModOperation extends AbstractArithmeticOperation { throw new SystemException(ErrorCode.XPTY0004); } -} \ 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/runtime/functions/arithmetic/ModScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModScalarEvaluatorFactory.java index 5e300ea..f5cdc13 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/ModScalarEvaluatorFactory.java @@ -16,7 +16,7 @@ */ package org.apache.vxquery.runtime.functions.arithmetic; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; public class ModScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -29,4 +29,4 @@ public class ModScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluator protected AbstractArithmeticOperation createArithmeticOperation() { return new ModOperation(); } -} \ 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/runtime/functions/arithmetic/MultiplyOperation.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java index 8be9077..d4704cb 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyOperation.java @@ -28,11 +28,11 @@ import org.apache.vxquery.datamodel.values.ValueTag; import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; -import edu.uci.ics.hyracks.data.std.primitive.DoublePointable; -import edu.uci.ics.hyracks.data.std.primitive.FloatPointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.FloatPointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class MultiplyOperation extends AbstractArithmeticOperation { protected final ArrayBackedValueStorage abvsInner = new ArrayBackedValueStorage(); @@ -403,4 +403,4 @@ public class MultiplyOperation extends AbstractArithmeticOperation { return decp1.longValue(); } -} \ 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/runtime/functions/arithmetic/MultiplyScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyScalarEvaluatorFactory.java index 20e2f57..fb5abb9 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/MultiplyScalarEvaluatorFactory.java @@ -16,7 +16,7 @@ */ package org.apache.vxquery.runtime.functions.arithmetic; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; public class MultiplyScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -29,4 +29,4 @@ public class MultiplyScalarEvaluatorFactory extends AbstractArithmeticScalarEval protected AbstractArithmeticOperation createArithmeticOperation() { return new MultiplyOperation(); } -} \ 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/runtime/functions/arithmetic/SubtractOperation.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java index 4311e04..9ac37ca 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractOperation.java @@ -29,11 +29,11 @@ import org.apache.vxquery.datamodel.values.ValueTag; import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; -import edu.uci.ics.hyracks.data.std.primitive.DoublePointable; -import edu.uci.ics.hyracks.data.std.primitive.FloatPointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.FloatPointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class SubtractOperation extends AbstractArithmeticOperation { protected final ArrayBackedValueStorage abvsInner1 = new ArrayBackedValueStorage(); @@ -651,4 +651,4 @@ public class SubtractOperation extends AbstractArithmeticOperation { return decp2.longValue(); } -} \ 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/runtime/functions/arithmetic/SubtractScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractScalarEvaluatorFactory.java index a1e73c9..ce97a57 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/arithmetic/SubtractScalarEvaluatorFactory.java @@ -16,7 +16,7 @@ */ package org.apache.vxquery.runtime.functions.arithmetic; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; public class SubtractScalarEvaluatorFactory extends AbstractArithmeticScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -29,4 +29,4 @@ public class SubtractScalarEvaluatorFactory extends AbstractArithmeticScalarEval protected AbstractArithmeticOperation createArithmeticOperation() { return new SubtractOperation(); } -} \ 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/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java index 78faf89..965e110 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluator.java @@ -21,10 +21,10 @@ import org.apache.vxquery.datamodel.accessors.PointablePoolFactory; import org.apache.vxquery.datamodel.accessors.TaggedValuePointable; import org.apache.vxquery.exceptions.SystemException; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.dataflow.common.data.accessors.IFrameTupleReference; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.dataflow.common.data.accessors.IFrameTupleReference; public abstract class AbstractTaggedValueArgumentAggregateEvaluator implements IAggregateEvaluator { private final IScalarEvaluator[] args; @@ -54,4 +54,4 @@ public abstract class AbstractTaggedValueArgumentAggregateEvaluator implements I } protected abstract void step(TaggedValuePointable[] args) throws SystemException; -} \ 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/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluatorFactory.java index b2eaa5b..2ab0b66 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentAggregateEvaluatorFactory.java @@ -18,12 +18,12 @@ package org.apache.vxquery.runtime.functions.base; import org.apache.vxquery.context.DynamicContext; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.api.context.IHyracksTaskContext; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.api.context.IHyracksTaskContext; public abstract class AbstractTaggedValueArgumentAggregateEvaluatorFactory implements IAggregateEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -47,4 +47,4 @@ public abstract class AbstractTaggedValueArgumentAggregateEvaluatorFactory imple } protected abstract IAggregateEvaluator createEvaluator(IScalarEvaluator[] args) throws AlgebricksException; -} \ 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/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java index e3ea702..e0229c2 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluator.java @@ -21,10 +21,10 @@ import org.apache.vxquery.datamodel.accessors.PointablePoolFactory; import org.apache.vxquery.datamodel.accessors.TaggedValuePointable; import org.apache.vxquery.exceptions.SystemException; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.dataflow.common.data.accessors.IFrameTupleReference; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.dataflow.common.data.accessors.IFrameTupleReference; public abstract class AbstractTaggedValueArgumentScalarEvaluator implements IScalarEvaluator { private final IScalarEvaluator[] args; @@ -54,4 +54,4 @@ public abstract class AbstractTaggedValueArgumentScalarEvaluator implements ISca } protected abstract void evaluate(TaggedValuePointable[] args, IPointable result) throws SystemException; -} \ 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/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluatorFactory.java index 35781cb..d07361b 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/base/AbstractTaggedValueArgumentScalarEvaluatorFactory.java @@ -16,10 +16,10 @@ */ package org.apache.vxquery.runtime.functions.base; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.api.context.IHyracksTaskContext; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.api.context.IHyracksTaskContext; public abstract class AbstractTaggedValueArgumentScalarEvaluatorFactory implements IScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -41,4 +41,4 @@ public abstract class AbstractTaggedValueArgumentScalarEvaluatorFactory implemen protected abstract IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args) throws AlgebricksException; -} \ No newline at end of file +}
