http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCompareEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCompareEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCompareEvaluatorFactory.java index 11d00c9..76e80b0 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCompareEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnCompareEvaluatorFactory.java @@ -26,13 +26,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory; 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.LongPointable; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; +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.LongPointable; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; public class FnCompareEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnConcatEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnConcatEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnConcatEvaluatorFactory.java index 053c930..7eef348 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnConcatEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnConcatEvaluatorFactory.java @@ -29,13 +29,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.cast.CastToStringOperation; 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.UTF8StringPointable; -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.UTF8StringPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class FnConcatEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnContainsEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnContainsEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnContainsEvaluatorFactory.java index d825371..977ed19 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnContainsEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnContainsEvaluatorFactory.java @@ -26,12 +26,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory; 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.UTF8StringPointable; +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.UTF8StringPointable; public class FnContainsEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnEndsWithEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnEndsWithEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnEndsWithEvaluatorFactory.java index 88630ed..81062ed 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnEndsWithEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnEndsWithEvaluatorFactory.java @@ -26,12 +26,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory; 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.UTF8StringPointable; +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.UTF8StringPointable; public class FnEndsWithEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnLowerCaseEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnLowerCaseEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnLowerCaseEvaluatorFactory.java index 1e3ac70..cf431cd 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnLowerCaseEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnLowerCaseEvaluatorFactory.java @@ -24,11 +24,11 @@ import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; 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.primitive.UTF8StringPointable; +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.primitive.UTF8StringPointable; public class FnLowerCaseEvaluatorFactory extends AbstractCharacterIteratorCopyingEvaluatorFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStartsWithEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStartsWithEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStartsWithEvaluatorFactory.java index 4c4ea2b..7d0cb7a 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStartsWithEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStartsWithEvaluatorFactory.java @@ -26,12 +26,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory; 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.UTF8StringPointable; +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.UTF8StringPointable; public class FnStartsWithEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringJoinEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringJoinEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringJoinEvaluatorFactory.java index 11107d5..576b409 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringJoinEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringJoinEvaluatorFactory.java @@ -28,13 +28,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory; 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.UTF8StringPointable; -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.UTF8StringPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class FnStringJoinEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringLengthEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringLengthEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringLengthEvaluatorFactory.java index 3388a55..298b45c 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringLengthEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringLengthEvaluatorFactory.java @@ -28,13 +28,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory; 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.UTF8StringPointable; -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.UTF8StringPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class FnStringLengthEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java index fa929da..1f6ba13 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringScalarEvaluatorFactory.java @@ -30,13 +30,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.cast.CastToStringOperation; import org.apache.vxquery.runtime.functions.util.AtomizeHelper; -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.UTF8StringPointable; -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.UTF8StringPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class FnStringScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java index a57f519..f77d869 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnStringToCodepointsEvaluatorFactory.java @@ -30,13 +30,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory; 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.UTF8StringPointable; -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.UTF8StringPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class FnStringToCodepointsEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringAfterEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringAfterEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringAfterEvaluatorFactory.java index b49f121..f069152 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringAfterEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringAfterEvaluatorFactory.java @@ -24,11 +24,11 @@ import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; 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.primitive.UTF8StringPointable; +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.primitive.UTF8StringPointable; public class FnSubstringAfterEvaluatorFactory extends AbstractCharacterIteratorCopyingEvaluatorFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringBeforeEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringBeforeEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringBeforeEvaluatorFactory.java index 3447f91..fb8e937 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringBeforeEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringBeforeEvaluatorFactory.java @@ -24,11 +24,11 @@ import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; 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.primitive.UTF8StringPointable; +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.primitive.UTF8StringPointable; public class FnSubstringBeforeEvaluatorFactory extends AbstractCharacterIteratorCopyingEvaluatorFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringEvaluatorFactory.java index 282caaa..0691a80 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnSubstringEvaluatorFactory.java @@ -24,14 +24,14 @@ import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; 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.primitive.DoublePointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; -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.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class FnSubstringEvaluatorFactory extends AbstractCharacterIteratorCopyingEvaluatorFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnUpperCaseEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnUpperCaseEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnUpperCaseEvaluatorFactory.java index a8f0f3f..08492ff 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnUpperCaseEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/FnUpperCaseEvaluatorFactory.java @@ -24,11 +24,11 @@ import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; 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.primitive.UTF8StringPointable; +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.primitive.UTF8StringPointable; public class FnUpperCaseEvaluatorFactory extends AbstractCharacterIteratorCopyingEvaluatorFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java index 7e93469..c170384 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/strings/UTF8StringCharacterIterator.java @@ -19,7 +19,7 @@ package org.apache.vxquery.runtime.functions.strings; import java.util.logging.Level; import java.util.logging.Logger; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; public class UTF8StringCharacterIterator implements ICharacterIterator { private static final Logger LOGGER = Logger.getLogger(UTF8StringCharacterIterator.class.getName()); http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/AbstractTypeScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/AbstractTypeScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/AbstractTypeScalarEvaluatorFactory.java index 0226172..d45108e 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/AbstractTypeScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/AbstractTypeScalarEvaluatorFactory.java @@ -24,11 +24,11 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory; import org.apache.vxquery.types.SequenceType; -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.IntegerPointable; +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.IntegerPointable; public abstract class AbstractTypeScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -70,4 +70,4 @@ public abstract class AbstractTypeScalarEvaluatorFactory extends AbstractTaggedV evaluate(args[0], result); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/InstanceOfScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/InstanceOfScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/InstanceOfScalarEvaluatorFactory.java index dd7ee61..d9c5796 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/InstanceOfScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/InstanceOfScalarEvaluatorFactory.java @@ -21,11 +21,11 @@ import org.apache.vxquery.datamodel.values.XDMConstants; import org.apache.vxquery.exceptions.SystemException; import org.apache.vxquery.types.SequenceType; -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 class InstanceOfScalarEvaluatorFactory extends AbstractTypeScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -56,4 +56,4 @@ public class InstanceOfScalarEvaluatorFactory extends AbstractTypeScalarEvaluato } }; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/PromoteScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/PromoteScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/PromoteScalarEvaluatorFactory.java index 594051d..c1bb24e 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/PromoteScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/PromoteScalarEvaluatorFactory.java @@ -30,12 +30,12 @@ import org.apache.vxquery.runtime.functions.cast.CastToStringOperation; import org.apache.vxquery.types.BuiltinTypeRegistry; import org.apache.vxquery.types.SequenceType; -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 PromoteScalarEvaluatorFactory extends AbstractTypeScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -203,4 +203,4 @@ public class PromoteScalarEvaluatorFactory extends AbstractTypeScalarEvaluatorFa } }; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/SequenceTypeMatcher.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/SequenceTypeMatcher.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/SequenceTypeMatcher.java index 12d0d93..19c2f99 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/SequenceTypeMatcher.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/SequenceTypeMatcher.java @@ -35,7 +35,7 @@ import org.apache.vxquery.types.Quantifier; import org.apache.vxquery.types.SchemaType; import org.apache.vxquery.types.SequenceType; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; public class SequenceTypeMatcher { private final NodeTreePointable ntp = (NodeTreePointable) NodeTreePointable.FACTORY.createPointable(); @@ -201,4 +201,4 @@ public class SequenceTypeMatcher { public String toString() { return "sequenceMatcher[" + this.sequenceType + "]"; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/TreatScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/TreatScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/TreatScalarEvaluatorFactory.java index 1bd6ac1..4913c71 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/TreatScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/type/TreatScalarEvaluatorFactory.java @@ -21,11 +21,11 @@ import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; import org.apache.vxquery.types.SequenceType; -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 class TreatScalarEvaluatorFactory extends AbstractTypeScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -55,4 +55,4 @@ public class TreatScalarEvaluatorFactory extends AbstractTypeScalarEvaluatorFact } }; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java index cb5a018..70270ab 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryOperation.java @@ -22,9 +22,9 @@ import java.io.IOException; import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable; 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.LongPointable; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.FloatPointable; +import org.apache.hyracks.data.std.primitive.LongPointable; public abstract class AbstractNumericUnaryOperation { http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java index 922243b..bd8c360 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/AbstractNumericUnaryScalarEvaluatorFactory.java @@ -28,13 +28,13 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.util.FunctionHelper; import org.apache.vxquery.types.BuiltinTypeRegistry; -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.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.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.LongPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public abstract class AbstractNumericUnaryScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { @@ -135,4 +135,4 @@ public abstract class AbstractNumericUnaryScalarEvaluatorFactory extends } protected abstract AbstractNumericUnaryOperation createNumericUnaryOperation(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java index db8a056..2cd9d86 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusOperation.java @@ -23,9 +23,9 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable; import org.apache.vxquery.datamodel.values.ValueTag; 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.LongPointable; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.FloatPointable; +import org.apache.hyracks.data.std.primitive.LongPointable; public class NumericUnaryMinusOperation extends AbstractNumericUnaryOperation { @@ -53,4 +53,4 @@ public class NumericUnaryMinusOperation extends AbstractNumericUnaryOperation { dOut.write(ValueTag.XS_INTEGER_TAG); dOut.writeLong(-longp.getLong()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java index fd19366..9bf7385 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryMinusScalarEvaluatorFactory.java @@ -16,7 +16,7 @@ */ package org.apache.vxquery.runtime.functions.unary; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; public class NumericUnaryMinusScalarEvaluatorFactory extends AbstractNumericUnaryScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -29,4 +29,4 @@ public class NumericUnaryMinusScalarEvaluatorFactory extends AbstractNumericUnar protected AbstractNumericUnaryOperation createNumericUnaryOperation() { return new NumericUnaryMinusOperation(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java index 6174402..7b29442 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusOperation.java @@ -23,9 +23,9 @@ import org.apache.vxquery.datamodel.accessors.atomic.XSDecimalPointable; import org.apache.vxquery.datamodel.values.ValueTag; 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.LongPointable; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.FloatPointable; +import org.apache.hyracks.data.std.primitive.LongPointable; public class NumericUnaryPlusOperation extends AbstractNumericUnaryOperation { @@ -52,4 +52,4 @@ public class NumericUnaryPlusOperation extends AbstractNumericUnaryOperation { dOut.write(ValueTag.XS_INTEGER_TAG); dOut.write(longp.getByteArray(), longp.getStartOffset(), longp.getLength()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java index 47ce59c..5e99dcc 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/unary/NumericUnaryPlusScalarEvaluatorFactory.java @@ -16,7 +16,7 @@ */ package org.apache.vxquery.runtime.functions.unary; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; public class NumericUnaryPlusScalarEvaluatorFactory extends AbstractNumericUnaryScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -29,4 +29,4 @@ public class NumericUnaryPlusScalarEvaluatorFactory extends AbstractNumericUnary protected AbstractNumericUnaryOperation createNumericUnaryOperation() { return new NumericUnaryMinusOperation(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java index 0c2b41a..1647364 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/ArithmeticHelper.java @@ -29,10 +29,10 @@ import org.apache.vxquery.runtime.functions.cast.CastToDoubleOperation; import org.apache.vxquery.types.BuiltinTypeConstants; import org.apache.vxquery.types.BuiltinTypeRegistry; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.primitive.DoublePointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class ArithmeticHelper { private final AbstractArithmeticOperation aOp; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/AtomizeHelper.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/AtomizeHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/AtomizeHelper.java index ed9cd72..cf70dd2 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/AtomizeHelper.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/AtomizeHelper.java @@ -30,9 +30,9 @@ import org.apache.vxquery.datamodel.accessors.nodes.PINodePointable; import org.apache.vxquery.datamodel.accessors.nodes.TextOrCommentNodePointable; import org.apache.vxquery.datamodel.values.ValueTag; -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.data.std.api.IPointable; +import org.apache.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class AtomizeHelper { AttributeNodePointable anp = (AttributeNodePointable) AttributeNodePointable.FACTORY.createPointable(); http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java index 3a20a86..920c815 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java @@ -42,13 +42,13 @@ import org.apache.vxquery.types.BuiltinTypeConstants; import org.apache.vxquery.types.BuiltinTypeRegistry; import org.apache.vxquery.xmlparser.XMLParser; -import edu.uci.ics.hyracks.api.exceptions.HyracksDataException; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.primitive.DoublePointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; -import edu.uci.ics.hyracks.dataflow.common.comm.util.ByteBufferInputStream; +import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream; public class FunctionHelper { http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFactoryProvider.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFactoryProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFactoryProvider.java index 91e776d..d4b159d 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFactoryProvider.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFactoryProvider.java @@ -18,9 +18,9 @@ package org.apache.vxquery.runtime.provider; import org.apache.vxquery.runtime.factory.hashfunction.VXQueryRawBinaryHashFunctionFactory; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.data.IBinaryHashFunctionFactoryProvider; -import edu.uci.ics.hyracks.api.dataflow.value.IBinaryHashFunctionFactory; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.data.IBinaryHashFunctionFactoryProvider; +import org.apache.hyracks.api.dataflow.value.IBinaryHashFunctionFactory; public class VXQueryBinaryHashFunctionFactoryProvider implements IBinaryHashFunctionFactoryProvider { http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFamilyProvider.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFamilyProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFamilyProvider.java index b73cc75..c5276b1 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFamilyProvider.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/provider/VXQueryBinaryHashFunctionFamilyProvider.java @@ -16,10 +16,10 @@ */ package org.apache.vxquery.runtime.provider; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.data.IBinaryHashFunctionFamilyProvider; -import edu.uci.ics.hyracks.api.dataflow.value.IBinaryHashFunctionFamily; -import edu.uci.ics.hyracks.data.std.accessors.MurmurHash3BinaryHashFunctionFamily; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.data.IBinaryHashFunctionFamilyProvider; +import org.apache.hyracks.api.dataflow.value.IBinaryHashFunctionFamily; +import org.apache.hyracks.data.std.accessors.MurmurHash3BinaryHashFunctionFamily; public class VXQueryBinaryHashFunctionFamilyProvider implements IBinaryHashFunctionFamilyProvider { http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java b/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java index 8a5845d..5c55731 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/serializer/XMLSerializer.java @@ -42,18 +42,18 @@ import org.apache.vxquery.datamodel.values.ValueTag; import org.apache.vxquery.exceptions.SystemException; import org.apache.vxquery.runtime.functions.cast.CastToStringOperation; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.data.IPrinter; -import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable; -import edu.uci.ics.hyracks.data.std.primitive.BytePointable; -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.primitive.ShortPointable; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; -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.data.IPrinter; +import org.apache.hyracks.data.std.primitive.BooleanPointable; +import org.apache.hyracks.data.std.primitive.BytePointable; +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.primitive.ShortPointable; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class XMLSerializer implements IPrinter { private final PointablePool pp; @@ -806,4 +806,4 @@ public class XMLSerializer implements IPrinter { @Override public void init() throws AlgebricksException { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java index 1ce1274..8177a06 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AbstractNodeType.java @@ -21,4 +21,4 @@ abstract class AbstractNodeType implements NodeType { public final boolean isAtomicType() { return false; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java index 2f8ffce..74e6630 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyNodeType.java @@ -41,4 +41,4 @@ public final class AnyNodeType extends AbstractNodeType { public boolean equals(Object other) { return other instanceof AnyNodeType; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java index bc5044c..ae4ce25 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AnySimpleType.java @@ -66,4 +66,4 @@ public final class AnySimpleType implements SimpleType { public boolean equals(Object other) { return other instanceof AnySimpleType; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java index 19519c2..92f21ed 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AnyType.java @@ -66,4 +66,4 @@ public final class AnyType implements ComplexType { public boolean equals(Object other) { return other instanceof AnyType; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/AtomicType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AtomicType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AtomicType.java index 19830af..e7257e5 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/AtomicType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AtomicType.java @@ -17,4 +17,4 @@ package org.apache.vxquery.types; public interface AtomicType extends ItemType, SimpleType { -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java index 0cacd59..b99b349 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/AttributeType.java @@ -81,4 +81,4 @@ public final class AttributeType extends AbstractNodeType { return false; return true; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinAtomicType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinAtomicType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinAtomicType.java index bc5ee48..3df9bac 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinAtomicType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinAtomicType.java @@ -81,4 +81,4 @@ final class BuiltinAtomicType implements AtomicType { return false; return true; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeConstants.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeConstants.java b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeConstants.java index 3e78819..eefebcc 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeConstants.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeConstants.java @@ -73,4 +73,4 @@ public class BuiltinTypeConstants { public static final int XS_ENTITIES_TYPE_ID = 51; public static final int BUILTIN_TYPE_COUNT = 52; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeQNames.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeQNames.java b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeQNames.java index aafbf16..9f762ff 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeQNames.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeQNames.java @@ -125,4 +125,4 @@ public class BuiltinTypeQNames { XQueryConstants.XS_PREFIX); public static final QName XSEXT_TYPE_TYPE_QNAME = new QName(XQueryConstants.XSEXT_NSURI, "type", XQueryConstants.XSEXT_PREFIX); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeRegistry.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeRegistry.java b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeRegistry.java index a5da4d7..7cfcb5c 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeRegistry.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/BuiltinTypeRegistry.java @@ -345,4 +345,4 @@ public final class BuiltinTypeRegistry { typeMap.put(BuiltinTypeQNames.XS_NOTATION_TYPE_QNAME, XS_NOTATION); TYPE_MAP = Collections.unmodifiableMap(typeMap); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java index 4ca4a7c..5766a75 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/CommentType.java @@ -41,4 +41,4 @@ public final class CommentType extends AbstractNodeType { public boolean equals(Object other) { return other instanceof CommentType; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/ComplexType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/ComplexType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/ComplexType.java index e570589..45dc0cc 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/ComplexType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/ComplexType.java @@ -18,4 +18,4 @@ package org.apache.vxquery.types; public interface ComplexType extends SchemaType { -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/DerivationProcess.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/DerivationProcess.java b/vxquery-core/src/main/java/org/apache/vxquery/types/DerivationProcess.java index cbe0a4a..2204220 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/DerivationProcess.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/DerivationProcess.java @@ -18,4 +18,4 @@ package org.apache.vxquery.types; public enum DerivationProcess { RESTRICTION, EXTENSION, LIST, UNION -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java index bc02842..66124f8 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/DocumentType.java @@ -65,4 +65,4 @@ public final class DocumentType extends AbstractNodeType { return false; return true; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java index 26dffe9..6f7d431 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/ElementType.java @@ -92,4 +92,4 @@ public final class ElementType extends AbstractNodeType { return false; return true; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java index 6eca7c4..61d1c4b 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/EmptySequenceType.java @@ -36,4 +36,4 @@ public final class EmptySequenceType implements ItemType { public boolean equals(Object other) { return other instanceof EmptySequenceType; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/ItemType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/ItemType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/ItemType.java index 1b1ab8f..054657e 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/ItemType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/ItemType.java @@ -18,4 +18,4 @@ package org.apache.vxquery.types; public interface ItemType extends XQType { public boolean isAtomicType(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/NameTest.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/NameTest.java b/vxquery-core/src/main/java/org/apache/vxquery/types/NameTest.java index e3fe193..fde6e07 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/NameTest.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/NameTest.java @@ -19,7 +19,7 @@ package org.apache.vxquery.types; import java.io.Serializable; import java.util.Arrays; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; public final class NameTest implements Serializable { private static final long serialVersionUID = 1L; @@ -92,4 +92,4 @@ public final class NameTest implements Serializable { return false; return true; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/NodeKind.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/NodeKind.java b/vxquery-core/src/main/java/org/apache/vxquery/types/NodeKind.java index f03eab8..c7fc25c 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/NodeKind.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/NodeKind.java @@ -24,4 +24,4 @@ public enum NodeKind { ELEMENT, PI, TEXT, -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/NodeType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/NodeType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/NodeType.java index 33513a6..cd43f97 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/NodeType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/NodeType.java @@ -18,4 +18,4 @@ package org.apache.vxquery.types; public interface NodeType extends ItemType { public NodeKind getNodeKind(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java index 2eeb1d4..7c58f52 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/NoneType.java @@ -36,4 +36,4 @@ public final class NoneType implements ItemType { public boolean equals(Object other) { return other instanceof NoneType; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java index d1f294a..46f847e 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/ProcessingInstructionType.java @@ -18,7 +18,7 @@ package org.apache.vxquery.types; import java.util.Arrays; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; public final class ProcessingInstructionType extends AbstractNodeType { public static final ProcessingInstructionType ANYPI = new ProcessingInstructionType(null); @@ -71,4 +71,4 @@ public final class ProcessingInstructionType extends AbstractNodeType { return false; return true; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/SchemaType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/SchemaType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/SchemaType.java index 369de64..4e9dce5 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/SchemaType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/SchemaType.java @@ -28,4 +28,4 @@ public interface SchemaType extends XQType { public boolean isComplexType(); public boolean isAtomicType(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/SimpleType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/SimpleType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/SimpleType.java index 26b948c..3c02ba7 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/SimpleType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/SimpleType.java @@ -18,4 +18,4 @@ package org.apache.vxquery.types; public interface SimpleType extends SchemaType { -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java index 0709245..2656775 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/TextType.java @@ -41,4 +41,4 @@ public final class TextType extends AbstractNodeType { public boolean equals(Object other) { return other instanceof TextType; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/TypeHelper.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/TypeHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/types/TypeHelper.java index 2dd0272..5ce1e3a 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/TypeHelper.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/TypeHelper.java @@ -28,4 +28,4 @@ public class TypeHelper { public static boolean isSortable(Class<?> type) { return false; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/TypeUtils.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/TypeUtils.java b/vxquery-core/src/main/java/org/apache/vxquery/types/TypeUtils.java index 09882d0..f76a423 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/TypeUtils.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/TypeUtils.java @@ -84,4 +84,4 @@ public class TypeUtils { subType = (AtomicType) subType.getBaseType(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/types/XQType.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/types/XQType.java b/vxquery-core/src/main/java/org/apache/vxquery/types/XQType.java index fbde3ed..59e894d 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/types/XQType.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/types/XQType.java @@ -19,4 +19,4 @@ package org.apache.vxquery.types; import java.io.Serializable; public interface XQType extends Serializable { -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/util/Filter.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/util/Filter.java b/vxquery-core/src/main/java/org/apache/vxquery/util/Filter.java index 5115210..91f42e0 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/util/Filter.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/util/Filter.java @@ -34,4 +34,4 @@ public interface Filter<T> { }; public boolean accept(T value) throws SystemException; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/util/GrowableIntArray.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/util/GrowableIntArray.java b/vxquery-core/src/main/java/org/apache/vxquery/util/GrowableIntArray.java index 82f2c08..9e7ecc0 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/util/GrowableIntArray.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/util/GrowableIntArray.java @@ -90,4 +90,4 @@ public class GrowableIntArray { } array = Arrays.copyOf(array, array.length + increment); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/util/SourceLocation.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/util/SourceLocation.java b/vxquery-core/src/main/java/org/apache/vxquery/util/SourceLocation.java index 3e697ed..0ec195c 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/util/SourceLocation.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/util/SourceLocation.java @@ -55,4 +55,4 @@ public final class SourceLocation { public String toString() { return sourceFileName + " (" + lineNumber + ":" + columnNumber + ")"; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/ITreeNodeIdProvider.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/ITreeNodeIdProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/ITreeNodeIdProvider.java index 425938f..f5f1830 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/ITreeNodeIdProvider.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/ITreeNodeIdProvider.java @@ -18,4 +18,4 @@ package org.apache.vxquery.xmlparser; public interface ITreeNodeIdProvider { public int getId(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java index 323b608..03a125b 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java @@ -16,10 +16,15 @@ package org.apache.vxquery.xmlparser; import java.io.DataOutput; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; +import org.apache.hyracks.api.comm.IFrameFieldAppender; +import org.apache.hyracks.api.comm.IFrameWriter; +import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.dataflow.common.comm.util.FrameUtils; import org.apache.vxquery.datamodel.accessors.TaggedValuePointable; import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable; import org.apache.vxquery.datamodel.builders.atomic.UTF8StringBuilder; @@ -44,14 +49,6 @@ import org.xml.sax.Locator; import org.xml.sax.SAXException; import org.xml.sax.ext.LexicalHandler; -import edu.uci.ics.hyracks.api.comm.IFrameWriter; -import edu.uci.ics.hyracks.api.exceptions.HyracksDataException; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; -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; - public class SAXContentHandler implements ContentHandler, LexicalHandler { // XML node builders private final AttributeNodeBuilder anb; @@ -65,9 +62,7 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler { private final List<ElementNodeBuilder> freeENBList; // Frame writing variables - private FrameTupleAppender appender; - private ByteBuffer frame; - private FrameTupleAccessor fta; + private IFrameFieldAppender appender; private int tupleIndex; private IFrameWriter writer; @@ -117,12 +112,11 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler { textABVS = new ArrayBackedValueStorage(); } - public SAXContentHandler(boolean attachTypes, ITreeNodeIdProvider nodeIdProvider, ByteBuffer frame, - FrameTupleAppender appender, List<SequenceType> childSequenceTypes) { + public SAXContentHandler(boolean attachTypes, ITreeNodeIdProvider nodeIdProvider, IFrameFieldAppender appender, + List<SequenceType> childSequenceTypes) { this(attachTypes, nodeIdProvider); // Frame writing variables - this.frame = frame; this.appender = appender; setChildPathSteps(childSequenceTypes); } @@ -145,9 +139,8 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler { } } - public void setupElementWriter(IFrameWriter writer, FrameTupleAccessor fta, int tupleIndex) { + public void setupElementWriter(IFrameWriter writer, int tupleIndex) { this.writer = writer; - this.fta = fta; this.tupleIndex = tupleIndex; } @@ -174,7 +167,7 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler { flushText(); docb.endChildrenChunk(); docb.finish(); - if (frame != null && appender != null) { + if (appender != null) { writeElement(); } } catch (IOException e) { @@ -284,7 +277,7 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler { /** * The filter settings here are similar to one in the class linked below. - * + * * @see org.apache.vxquery.runtime.functions.step.NodeTestFilter.java */ private boolean startElementChildPathStep(String uri, String localName) { @@ -523,27 +516,29 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler { } private void addNodeToTuple(TaggedValuePointable result, int t) throws HyracksDataException { - // Send to the writer. - if (!addNodeToTupleAppender(result, t)) { - FrameUtils.flushFrame(frame, writer); - appender.reset(frame, true); - if (!addNodeToTupleAppender(result, t)) { - throw new HyracksDataException("Could not write frame."); - } - } - } - - private boolean addNodeToTupleAppender(TaggedValuePointable result, int t) throws HyracksDataException { - // First copy all new fields over. - if (fta.getFieldCount() > 0) { - for (int f = 0; f < fta.getFieldCount(); ++f) { - if (!appender.appendField(fta, t, f)) { - return false; - } - } - } - return appender.appendField(result.getByteArray(), result.getStartOffset(), result.getLength()); - } + FrameUtils.appendFieldToWriter(writer, appender, result.getByteArray(), result.getStartOffset(), + result.getLength()); + // // Send to the writer. + // if (!addNodeToTupleAppender(result, t)) { + // FrameUtils.flushFrame(frame, writer); + // appender.reset(frame, true); + // if (!addNodeToTupleAppender(result, t)) { + // throw new HyracksDataException("Could not write frame."); + // } + // } + } + // + // private boolean addNodeToTupleAppender(TaggedValuePointable result, int t) throws HyracksDataException { + // // First copy all new fields over. + // if (fta.getFieldCount() > 0) { + // for (int f = 0; f < fta.getFieldCount(); ++f) { + // if (!appender.appendField(fta, t, f)) { + // return false; + // } + // } + // } + // return appender.appendField(result.getByteArray(), result.getStartOffset(), result.getLength()); + // } private String getStringFromBytes(byte[] bytes) { if (bytes == null) { @@ -571,4 +566,4 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler { return true; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java index 7f1f3f3..957b91e 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/TreeNodeIdProvider.java @@ -51,4 +51,4 @@ public class TreeNodeIdProvider implements ITreeNodeIdProvider { } return count; } -} \ No newline at end of file +}
