Changeset: 42d0c95cfee3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/42d0c95cfee3
Modified Files:
sql/server/rel_select.c
sql/test/nested/Tests/All
sql/test/nested/Tests/bluesky.test.in
Branch: nested
Log Message:
reset_intern for extracted columns
diffs (92 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -923,7 +923,6 @@ rel_named_table_function(sql_query *quer
if (l->next) { /* table call with subquery */
int is_value = 1;
if (l->next->type == type_symbol || l->next->type == type_list)
{
- exp_kind iek = {type_value, card_set, TRUE};
int count = 0;
if (l->next->type == type_symbol)
@@ -945,6 +944,7 @@ rel_named_table_function(sql_query *quer
return NULL;
is_value = 0;
} else {
+ exp_kind iek = {type_value,
unnest?card_row:card_set, TRUE};
for ( ; n; n = n->next) {
sql_exp *e = rel_value_exp(query,
&outer, n->data.sym, sql_sel | sql_from, iek);
@@ -4331,6 +4331,7 @@ rel_selection_ref(sql_query *query, sql_
nl = dlist_create(sa);
exp_setname(query->sql, ve, NULL, name);
+ reset_intern(ve);
/* now we should rewrite the selection
such that it uses the new group by column */
dlist_append_string(sa, nl,
sa_strdup(sa, name));
nsym = symbol_create_list(sa, to, nl);
diff --git a/sql/test/nested/Tests/All b/sql/test/nested/Tests/All
--- a/sql/test/nested/Tests/All
+++ b/sql/test/nested/Tests/All
@@ -8,4 +8,4 @@ jdocs
combinations
array_of_comp_with_array
comp_with_array_of_comp
-#bluesky
+bluesky
diff --git a/sql/test/nested/Tests/bluesky.test.in
b/sql/test/nested/Tests/bluesky.test.in
--- a/sql/test/nested/Tests/bluesky.test.in
+++ b/sql/test/nested/Tests/bluesky.test.in
@@ -73,37 +73,37 @@ 1
query TII
SELECT data."commit"."collection" AS event, "hour"(epoch(cast(data.time_us as
bigint)/(1000*1000))) as hour_of_day, count(*) AS cnt FROM bluesky WHERE
data.kind = 'commit' AND data."commit"."operation" = 'create' AND
data."commit"."collection" in ('app.bsky.feed.post', 'app.bsky.feed.repost',
'app.bsky.feed.like') GROUP BY event, hour_of_day ORDER BY hour_of_day, event
----
+app.bsky.feed.like
+17
+3
app.bsky.feed.post
- 17
- 3
-app.bsky.feed.like
- 17
- 3
-app.bsky.graph.repost
- 17
- 1
+17
+3
+app.bsky.feed.repost
+17
+1
# Q4
query TT
SELECT data.did as user_id, epoch(cast(min(data.time_us) as bigint)/1000000)
as first_post_ts FROM bluesky WHERE data.kind = 'commit' AND
data."commit"."operation" = 'create' AND data."commit"."collection" =
'app.bsky.feed.post' GROUP BY user_id ORDER BY first_post_ts ASC LIMIT 3
----
-"did:plc:yj3sjq3blzpynh27cumnp5ks"
+did:plc:yj3sjq3blzpynh27cumnp5ks
2024-11-21 17:25:49+01:00
-"did:plc:l5o3qjrmfztir54cpwlv2eme"
+did:plc:l5o3qjrmfztir54cpwlv2eme
2024-11-21 17:25:49+01:00
-"did:plc:s4bwqchfzm6gjqfeb6mexgbu"
+did:plc:s4bwqchfzm6gjqfeb6mexgbu
2024-11-21 17:25:49+01:00
# Q5
-query TI
+query TT
SELECT data.did as user_id, timestampdiff(epoch(cast(min(data.time_us) as
bigint)/1000000), epoch(cast(max(data.time_us) as bigint)/1000000))*1000 AS
activity_span FROM bluesky WHERE data.kind = 'commit' AND
data."commit"."operation" = 'create' AND data."commit"."collection" =
'app.bsky.feed.post' GROUP BY user_id ORDER BY activity_span DESC LIMIT 3
----
-"did:plc:yj3sjq3blzpynh27cumnp5ks"
+did:plc:yj3sjq3blzpynh27cumnp5ks
0:00:00
-"did:plc:l5o3qjrmfztir54cpwlv2eme"
+did:plc:l5o3qjrmfztir54cpwlv2eme
0:00:00
-"did:plc:s4bwqchfzm6gjqfeb6mexgbu"
+did:plc:s4bwqchfzm6gjqfeb6mexgbu
0:00:00
statement ok
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
