Repository: asterixdb Updated Branches: refs/heads/master 717e9415c -> 2e3d16739
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_before/interval_before.4.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_before/interval_before.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_before/interval_before.4.adm new file mode 100644 index 0000000..f38e40b --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_before/interval_before.4.adm @@ -0,0 +1,5 @@ +{ "staff": "Franklin", "student": "Olga" } +{ "staff": "Maryann", "student": "Charles" } +{ "staff": "Maryann", "student": "Frank" } +{ "staff": "Maryann", "student": "Mary" } +{ "staff": "Maryann", "student": "Olga" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_covers/interval_covers.3.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_covers/interval_covers.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_covers/interval_covers.3.adm new file mode 100644 index 0000000..4e22101 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_covers/interval_covers.3.adm @@ -0,0 +1,15 @@ +{ "staff": "Elisabeth", "student": "Karen" } +{ "staff": "Elisabeth", "student": "Mary" } +{ "staff": "Elisabeth", "student": "Steve" } +{ "staff": "Elisabeth", "student": "Tess" } +{ "staff": "Franklin", "student": "Karen" } +{ "staff": "Maryann", "student": "Karen" } +{ "staff": "Maryann", "student": "Steve" } +{ "staff": "Maryann", "student": "Tess" } +{ "staff": "Vicky", "student": "Charles" } +{ "staff": "Vicky", "student": "Frank" } +{ "staff": "Vicky", "student": "Karen" } +{ "staff": "Vicky", "student": "Mary" } +{ "staff": "Vicky", "student": "Olga" } +{ "staff": "Vicky", "student": "Steve" } +{ "staff": "Vicky", "student": "Tess" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_covers/interval_covers.4.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_covers/interval_covers.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_covers/interval_covers.4.adm new file mode 100644 index 0000000..1a67e10 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_covers/interval_covers.4.adm @@ -0,0 +1,4 @@ +{ "staff": "Zack", "student": "Charles" } +{ "staff": "Zack", "student": "Frank" } +{ "staff": "Zack", "student": "Mary" } +{ "staff": "Zack", "student": "Olga" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_ends/interval_ends.3.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_ends/interval_ends.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_ends/interval_ends.3.adm new file mode 100644 index 0000000..5af9101 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_ends/interval_ends.3.adm @@ -0,0 +1,7 @@ +{ "staff": "Elisabeth", "student": "Steve" } +{ "staff": "Elisabeth", "student": "Tess" } +{ "staff": "Franklin", "student": "Karen" } +{ "staff": "Maryann", "student": "Steve" } +{ "staff": "Maryann", "student": "Tess" } +{ "staff": "Vicky", "student": "Steve" } +{ "staff": "Vicky", "student": "Tess" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_ends/interval_ends.4.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_ends/interval_ends.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_ends/interval_ends.4.adm new file mode 100644 index 0000000..5857139 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_ends/interval_ends.4.adm @@ -0,0 +1 @@ +{ "staff": "Zack", "student": "Olga" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_meets/interval_meets.3.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_meets/interval_meets.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_meets/interval_meets.3.adm new file mode 100644 index 0000000..5568195 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_meets/interval_meets.3.adm @@ -0,0 +1,2 @@ +{ "staff": "Alex", "student": "Tess" } +{ "staff": "Henry", "student": "Tess" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_meets/interval_meets.4.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_meets/interval_meets.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_meets/interval_meets.4.adm new file mode 100644 index 0000000..cd4b3ba --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_meets/interval_meets.4.adm @@ -0,0 +1,4 @@ +{ "staff": "Alex", "student": "Olga" } +{ "staff": "Franklin", "student": "Charles" } +{ "staff": "Franklin", "student": "Frank" } +{ "staff": "Henry", "student": "Olga" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlapping/interval_overlapping.3.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlapping/interval_overlapping.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlapping/interval_overlapping.3.adm new file mode 100644 index 0000000..4ecd143 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlapping/interval_overlapping.3.adm @@ -0,0 +1,35 @@ +{ "staff": "Alex", "student": "Charles" } +{ "staff": "Alex", "student": "Frank" } +{ "staff": "Alex", "student": "Karen" } +{ "staff": "Alex", "student": "Mary" } +{ "staff": "Alex", "student": "Steve" } +{ "staff": "Elisabeth", "student": "Charles" } +{ "staff": "Elisabeth", "student": "Frank" } +{ "staff": "Elisabeth", "student": "Karen" } +{ "staff": "Elisabeth", "student": "Mary" } +{ "staff": "Elisabeth", "student": "Olga" } +{ "staff": "Elisabeth", "student": "Steve" } +{ "staff": "Elisabeth", "student": "Tess" } +{ "staff": "Franklin", "student": "Karen" } +{ "staff": "Franklin", "student": "Mary" } +{ "staff": "Franklin", "student": "Steve" } +{ "staff": "Franklin", "student": "Tess" } +{ "staff": "Henry", "student": "Charles" } +{ "staff": "Henry", "student": "Frank" } +{ "staff": "Henry", "student": "Karen" } +{ "staff": "Henry", "student": "Mary" } +{ "staff": "Henry", "student": "Steve" } +{ "staff": "Maryann", "student": "Karen" } +{ "staff": "Maryann", "student": "Steve" } +{ "staff": "Maryann", "student": "Tess" } +{ "staff": "Vicky", "student": "Charles" } +{ "staff": "Vicky", "student": "Frank" } +{ "staff": "Vicky", "student": "Karen" } +{ "staff": "Vicky", "student": "Mary" } +{ "staff": "Vicky", "student": "Olga" } +{ "staff": "Vicky", "student": "Steve" } +{ "staff": "Vicky", "student": "Tess" } +{ "staff": "Zack", "student": "Charles" } +{ "staff": "Zack", "student": "Frank" } +{ "staff": "Zack", "student": "Mary" } +{ "staff": "Zack", "student": "Olga" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlapping/interval_overlapping.4.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlapping/interval_overlapping.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlapping/interval_overlapping.4.adm new file mode 100644 index 0000000..4ecd143 --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlapping/interval_overlapping.4.adm @@ -0,0 +1,35 @@ +{ "staff": "Alex", "student": "Charles" } +{ "staff": "Alex", "student": "Frank" } +{ "staff": "Alex", "student": "Karen" } +{ "staff": "Alex", "student": "Mary" } +{ "staff": "Alex", "student": "Steve" } +{ "staff": "Elisabeth", "student": "Charles" } +{ "staff": "Elisabeth", "student": "Frank" } +{ "staff": "Elisabeth", "student": "Karen" } +{ "staff": "Elisabeth", "student": "Mary" } +{ "staff": "Elisabeth", "student": "Olga" } +{ "staff": "Elisabeth", "student": "Steve" } +{ "staff": "Elisabeth", "student": "Tess" } +{ "staff": "Franklin", "student": "Karen" } +{ "staff": "Franklin", "student": "Mary" } +{ "staff": "Franklin", "student": "Steve" } +{ "staff": "Franklin", "student": "Tess" } +{ "staff": "Henry", "student": "Charles" } +{ "staff": "Henry", "student": "Frank" } +{ "staff": "Henry", "student": "Karen" } +{ "staff": "Henry", "student": "Mary" } +{ "staff": "Henry", "student": "Steve" } +{ "staff": "Maryann", "student": "Karen" } +{ "staff": "Maryann", "student": "Steve" } +{ "staff": "Maryann", "student": "Tess" } +{ "staff": "Vicky", "student": "Charles" } +{ "staff": "Vicky", "student": "Frank" } +{ "staff": "Vicky", "student": "Karen" } +{ "staff": "Vicky", "student": "Mary" } +{ "staff": "Vicky", "student": "Olga" } +{ "staff": "Vicky", "student": "Steve" } +{ "staff": "Vicky", "student": "Tess" } +{ "staff": "Zack", "student": "Charles" } +{ "staff": "Zack", "student": "Frank" } +{ "staff": "Zack", "student": "Mary" } +{ "staff": "Zack", "student": "Olga" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlaps/interval_overlaps.3.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlaps/interval_overlaps.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlaps/interval_overlaps.3.adm new file mode 100644 index 0000000..94ac56a --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlaps/interval_overlaps.3.adm @@ -0,0 +1,6 @@ +{ "staff": "Alex", "student": "Karen" } +{ "staff": "Alex", "student": "Steve" } +{ "staff": "Franklin", "student": "Steve" } +{ "staff": "Franklin", "student": "Tess" } +{ "staff": "Henry", "student": "Karen" } +{ "staff": "Henry", "student": "Steve" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlaps/interval_overlaps.4.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlaps/interval_overlaps.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlaps/interval_overlaps.4.adm new file mode 100644 index 0000000..9e5549f --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_overlaps/interval_overlaps.4.adm @@ -0,0 +1,10 @@ +{ "staff": "Alex", "student": "Charles" } +{ "staff": "Alex", "student": "Frank" } +{ "staff": "Alex", "student": "Mary" } +{ "staff": "Elisabeth", "student": "Charles" } +{ "staff": "Elisabeth", "student": "Frank" } +{ "staff": "Elisabeth", "student": "Olga" } +{ "staff": "Franklin", "student": "Mary" } +{ "staff": "Henry", "student": "Charles" } +{ "staff": "Henry", "student": "Frank" } +{ "staff": "Henry", "student": "Mary" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_starts/interval_starts.3.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_starts/interval_starts.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_starts/interval_starts.3.adm new file mode 100644 index 0000000..54ab54e --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_starts/interval_starts.3.adm @@ -0,0 +1 @@ +{ "staff": "Zack", "student": "Mary" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_starts/interval_starts.4.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_starts/interval_starts.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_starts/interval_starts.4.adm new file mode 100644 index 0000000..6cd921a --- /dev/null +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/temporal/interval_joins/interval_starts/interval_starts.4.adm @@ -0,0 +1,4 @@ +{ "staff": "Elisabeth", "student": "Mary" } +{ "staff": "Vicky", "student": "Charles" } +{ "staff": "Vicky", "student": "Frank" } +{ "staff": "Vicky", "student": "Olga" } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml index 0a45cdf..e90b2e7 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml @@ -16,12 +16,15 @@ ! specific language governing permissions and limitations ! under the License. !--> +<!-- Keep test-suite list in Alphabetical order. --> <!DOCTYPE test-suite [ + <!ENTITY APIQueries SYSTEM "queries/api/APIQueries.xml"> <!ENTITY ComparisonQueries SYSTEM "queries/comparison/ComparisonQueries.xml"> - <!ENTITY RecordsQueries SYSTEM "queries/records/RecordsQueries.xml"> <!ENTITY DeepEqualQueries SYSTEM "queries/comparison/deep_equal/DeepEqualQueries.xml"> - <!ENTITY APIQueries SYSTEM "queries/api/APIQueries.xml"> + <!ENTITY RecordsQueries SYSTEM "queries/records/RecordsQueries.xml"> + <!ENTITY TemporalQueries SYSTEM "queries/temporal/TemporalQueries.xml"> + ]> <test-suite @@ -4867,7 +4870,7 @@ </test-case> <test-case FilePath="scan"> <compilation-unit name="alltypes_01"> - <parameter name="wrapper-array" value="true"/> + <parameter name="wrapper-array" value="true" /> <output-dir compare="Text">alltypes_01-wrapped</output-dir> </compilation-unit> </test-case> @@ -4878,7 +4881,7 @@ </test-case> <test-case FilePath="scan"> <compilation-unit name="alltypes_01"> - <parameter name="wrapper-array" value="false"/> + <parameter name="wrapper-array" value="false" /> <output-dir compare="Lossless-JSON">alltypes_01-losslessjson-unwrapped</output-dir> </compilation-unit> </test-case> @@ -6709,138 +6712,7 @@ </test-case> </test-group> <test-group name="temporal"> - <test-case FilePath="temporal"> - <compilation-unit name="overlap_bins_gby_3"> - <output-dir compare="Text">overlap_bins_gby_3</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="agg_01"> - <output-dir compare="Text">agg_01</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="overlap_bins_gby_1"> - <output-dir compare="Text">overlap_bins_gby_1</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="duration_functions"> - <output-dir compare="Text">duration_functions</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="overlap_bins_gby_0"> - <output-dir compare="Text">overlap_bins_gby_0</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="get_overlapping_interval"> - <output-dir compare="Text">get_overlapping_interval</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="overlap_bins"> - <output-dir compare="Text">overlap_bins</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="parse_02"> - <output-dir compare="Text">parse_02</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="parse_01"> - <output-dir compare="Text">parse_01</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="day_of_week_01"> - <output-dir compare="Text">day_of_week_01</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="interval_bin"> - <output-dir compare="Text">interval_bin</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="interval_bin_gby_0"> - <output-dir compare="Text">interval_bin_gby_0</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="interval_bin_gby_1"> - <output-dir compare="Text">interval_bin_gby_1</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="accessors"> - <output-dir compare="Text">accessors</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="accessors_interval"> - <output-dir compare="Text">accessors_interval</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="accessors_interval_null"> - <output-dir compare="Text">accessors_interval_null</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="adjust_timezone"> - <output-dir compare="Text">adjust_timezone</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="calendar_duration"> - <output-dir compare="Text">calendar_duration</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="date_functions"> - <output-dir compare="Text">date_functions</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="datetime_functions"> - <output-dir compare="Text">datetime_functions</output-dir> - </compilation-unit> - </test-case> - <!-- - <test-case FilePath="temporal"> - <compilation-unit name="insert_from_delimited_ds"> - <output-dir compare="Text">insert_from_delimited_ds</output-dir> - </compilation-unit> - </test-case> - --> - <test-case FilePath="temporal"> - <compilation-unit name="insert_from_ext_ds"> - <output-dir compare="Text">insert_from_ext_ds</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="insert_from_ext_ds_2"> - <output-dir compare="Text">insert_from_ext_ds_2</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="interval_functions"> - <output-dir compare="Text">interval_functions</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="time_functions"> - <output-dir compare="Text">time_functions</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="temporal"> - <compilation-unit name="duration_comps"> - <output-dir compare="Text">duration_comps</output-dir> - </compilation-unit> - </test-case> + &TemporalQueries; </test-group> <test-group name="leftouterjoin"> <test-case FilePath="leftouterjoin"> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-doc/src/main/markdown/builtins/7_allens.md ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-doc/src/main/markdown/builtins/7_allens.md b/asterixdb/asterix-doc/src/main/markdown/builtins/7_allens.md index 1f69d8e..ad7bd7e 100644 --- a/asterixdb/asterix-doc/src/main/markdown/builtins/7_allens.md +++ b/asterixdb/asterix-doc/src/main/markdown/builtins/7_allens.md @@ -143,11 +143,8 @@ Note that `interval_overlapping` is not an Allen's Relation, but syntactic sugar * Return Value: * a `boolean` value. Specifically, `interval_overlapping(interval1, interval2)` is true if - (interval2.start >= interval1.start - AND interval2.start < interval1.end) - OR - (interval2.end > interval1.start - AND interval2.end <= interval1.end) + interval1.start < interval2.end + AND interval1.end > interval2.start * `missing` if the argument is a `missing` value, * `null` if any argument is a `null` value but no argument is a `missing` value, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2e3d1673/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalLogic.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalLogic.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalLogic.java index 23f0da3..8f447d0 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalLogic.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/temporal/IntervalLogic.java @@ -30,10 +30,10 @@ public class IntervalLogic implements Serializable { private static final long serialVersionUID = 1L; private final ComparisonHelper ch = new ComparisonHelper(); - private final IPointable s1 = VoidPointable.FACTORY.createPointable(); - private final IPointable e1 = VoidPointable.FACTORY.createPointable(); - private final IPointable s2 = VoidPointable.FACTORY.createPointable(); - private final IPointable e2 = VoidPointable.FACTORY.createPointable(); + private final transient IPointable s1 = VoidPointable.FACTORY.createPointable(); + private final transient IPointable e1 = VoidPointable.FACTORY.createPointable(); + private final transient IPointable s2 = VoidPointable.FACTORY.createPointable(); + private final transient IPointable e2 = VoidPointable.FACTORY.createPointable(); public boolean validateInterval(AIntervalPointable ip1) throws HyracksDataException { ip1.getStart(s1); @@ -115,10 +115,8 @@ public class IntervalLogic implements Serializable { ip1.getEnd(e1); ip2.getStart(s2); ip2.getEnd(e2); - return (ch.compare(ip1.getTypeTag(), ip2.getTypeTag(), s1, s2) <= 0 - && ch.compare(ip1.getTypeTag(), ip2.getTypeTag(), e1, s2) > 0) - || (ch.compare(ip1.getTypeTag(), ip2.getTypeTag(), e1, e2) >= 0 - && ch.compare(ip1.getTypeTag(), ip2.getTypeTag(), s1, e2) < 0); + return ch.compare(ip1.getTypeTag(), ip2.getTypeTag(), s1, e2) < 0 + && ch.compare(ip1.getTypeTag(), ip2.getTypeTag(), e1, s2) > 0; } /**
