Changeset: 3a3d72880a40 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3a3d72880a40
Modified Files:
gdk/gdk_batop.c
sql/test/merge-partitions/Tests/mergepart31.test
Branch: pp_hashjoin
Log Message:
merged with default
diffs (54 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -2071,6 +2071,14 @@ BATslice(BAT *b, BUN l, BUN h)
} else {
bn->tnokey[0] = bn->tnokey[1] = 0;
}
+ if (bi.minpos >= l && bi.minpos < h)
+ bn->tminpos = bi.minpos - l;
+ else
+ bn->tminpos = BUN_NONE;
+ if (bi.maxpos >= l && bi.maxpos < h)
+ bn->tmaxpos = bi.maxpos - l;
+ else
+ bn->tmaxpos = BUN_NONE;
}
doreturn:
bat_iterator_end(&bi);
diff --git a/sql/test/merge-partitions/Tests/mergepart31.test
b/sql/test/merge-partitions/Tests/mergepart31.test
--- a/sql/test/merge-partitions/Tests/mergepart31.test
+++ b/sql/test/merge-partitions/Tests/mergepart31.test
@@ -215,9 +215,7 @@ munion (
| | ) [ ("splitted"."stamp" NOT NULL UNIQUE) <= (timestamp(7) "2020-10-01
00:00:00.000000") ]
| ) [ tinyint(1) "1" ],
| project (
-| | select (
-| | | table("sys"."second_decade") [ "second_decade"."stamp" NOT NULL UNIQUE
as "splitted"."stamp" ]
-| | ) [ ("splitted"."stamp" NOT NULL UNIQUE) <= (timestamp(7) "2020-10-01
00:00:00.000000") ]
+| | table("sys"."second_decade") [ "second_decade"."stamp" NOT NULL UNIQUE as
"splitted"."stamp" ]
| ) [ tinyint(1) "1" ],
| project (
| | select (
@@ -272,8 +270,8 @@ explain show details select 1 from split
----
project (
| select (
-| | table("sys"."third_decade") [ "third_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
-| ) [ (timestamp(7) "2020-01-01 00:00:00.000000") < ("splitted"."stamp"
UNIQUE) <= (timestamp(7) "2020-01-01 00:00:00.000000") ]
+| | [ timestamp(7) NULL as "splitted"."stamp" ]
+| ) [ boolean(1) "false" ]
) [ tinyint(1) "1" ]
skipif knownfail
@@ -594,8 +592,8 @@ explain show details select 1 from split
----
project (
| select (
-| | table("sys"."third_decade2") [ "third_decade2"."stamp" NOT NULL UNIQUE as
"splitted2"."stamp" ]
-| ) [ ("splitted2"."stamp" NOT NULL UNIQUE) > (int(31) "100"),
("splitted2"."stamp" NOT NULL UNIQUE) in (int(31) "5", int(31) "6") ]
+| | [ int(3) NULL as "splitted2"."stamp" ]
+| ) [ boolean(1) "false" ]
) [ tinyint(1) "1" ]
skipif knownfail
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
