This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0-var
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0-var by this push:
new 35ab68dd9c4 [Fix](variant) fix topn two phase read slot lost paths
info (#28618)
35ab68dd9c4 is described below
commit 35ab68dd9c4102bf0ecb5b755850375e8e196885
Author: lihangyu <[email protected]>
AuthorDate: Tue Dec 19 17:24:16 2023 +0800
[Fix](variant) fix topn two phase read slot lost paths info (#28618)
---
.../java/org/apache/doris/analysis/Analyzer.java | 1 +
regression-test/data/variant_p0/load.out | 2 +-
regression-test/data/variant_p0/sql/gh_data.out | 40 +++++++++++-----------
3 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java
index 3ff682023cf..f21e3e1b3ba 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/Analyzer.java
@@ -1149,6 +1149,7 @@ public class Analyzer {
// result.setLabel(srcSlotDesc.getLabel());
result.setStats(srcSlotDesc.getStats());
result.setType(srcSlotDesc.getType());
+ result.setSubColLables(srcSlotDesc.getSubColLables());
result.setIsNullable(srcSlotDesc.getIsNullable());
if (srcSlotDesc.getColumn() != null) {
result.setColumn(srcSlotDesc.getColumn());
diff --git a/regression-test/data/variant_p0/load.out
b/regression-test/data/variant_p0/load.out
index 57cffbe6574..3c66100077d 100644
--- a/regression-test/data/variant_p0/load.out
+++ b/regression-test/data/variant_p0/load.out
@@ -164,7 +164,7 @@
[123]
-- !sql_25 --
-50000 55000.000000007036 6150000
+50000 54999.99999995274 6150000
-- !sql_26 --
5000
diff --git a/regression-test/data/variant_p0/sql/gh_data.out
b/regression-test/data/variant_p0/sql/gh_data.out
index 257f1fb0ce6..78d91805b62 100644
--- a/regression-test/data/variant_p0/sql/gh_data.out
+++ b/regression-test/data/variant_p0/sql/gh_data.out
@@ -58,26 +58,26 @@ disclose/diodata 2
73801003 1
-- !gh_data_13 --
-27
{"payload":{"action":"started"},"created_at":"2021-01-02T16:37:27Z","id":"14690746717","repo":{"url":"https://api.github.com/repos/leonardomso/33-js-concepts","id":147350463,"name":"leonardomso/33-js-concepts"},"actor":{"gravatar_id":"","display_login":"sergdudnik","url":"https://api.github.com/users/sergdudnik","id":16341546,"login":"sergdudnik","avatar_url":"https://avatars.githubusercontent.com/u/16341546?"},"public":1,"type":"WatchEvent"}
{"payload":{"action":"started"},"created_a [...]
-36
{"payload":{"action":"started"},"created_at":"2021-01-02T16:37:27Z","id":"14690746732","repo":{"url":"https://api.github.com/repos/odeke-em/drive","id":26109545,"name":"odeke-em/drive"},"actor":{"gravatar_id":"","display_login":"juliusHuelsmann","url":"https://api.github.com/users/juliusHuelsmann","id":9212314,"login":"juliusHuelsmann","avatar_url":"https://avatars.githubusercontent.com/u/9212314?"},"public":1,"type":"WatchEvent"}
{"payload":{"action":"started"},"created_at":"2021-01- [...]
-46
{"payload":{"action":"started"},"created_at":"2021-01-02T16:37:27Z","org":{"gravatar_id":"","url":"https://api.github.com/orgs/GO-LiFE","id":38434522,"login":"GO-LiFE","avatar_url":"https://avatars.githubusercontent.com/u/38434522?"},"id":"14690746749","repo":{"url":"https://api.github.com/repos/GO-LiFE/GoFIT_SDK_Android","id":141905736,"name":"GO-LiFE/GoFIT_SDK_Android"},"actor":{"gravatar_id":"","display_login":"okbean","url":"https://api.github.com/users/okbean","id":75969386,"logi
[...]
-56
{"payload":{"action":"started"},"created_at":"2021-01-02T16:37:28Z","id":"14690746773","repo":{"url":"https://api.github.com/repos/MrXujiang/h5-Dooring","id":289417971,"name":"MrXujiang/h5-Dooring"},"actor":{"gravatar_id":"","display_login":"PWDream","url":"https://api.github.com/users/PWDream","id":4903755,"login":"PWDream","avatar_url":"https://avatars.githubusercontent.com/u/4903755?"},"public":1,"type":"WatchEvent"}
{"payload":{"action":"started"},"created_at":"2021-01-02T16:37:28 [...]
-86
{"payload":{"action":"started"},"created_at":"2021-01-02T16:37:29Z","id":"14690746843","repo":{"url":"https://api.github.com/repos/redsaph/cleartext","id":106453399,"name":"redsaph/cleartext"},"actor":{"gravatar_id":"","display_login":"Gui-Yom","url":"https://api.github.com/users/Gui-Yom","id":25181283,"login":"Gui-Yom","avatar_url":"https://avatars.githubusercontent.com/u/25181283?"},"public":1,"type":"WatchEvent"}
{"payload":{"action":"started"},"created_at":"2021-01-02T16:37:29Z"," [...]
-98
{"payload":{"action":"started"},"created_at":"2021-01-02T16:37:29Z","org":{"gravatar_id":"","url":"https://api.github.com/orgs/sherlock-project","id":48293496,"login":"sherlock-project","avatar_url":"https://avatars.githubusercontent.com/u/48293496?"},"id":"14690746866","repo":{"url":"https://api.github.com/repos/sherlock-project/sherlock","id":162998479,"name":"sherlock-project/sherlock"},"actor":{"gravatar_id":"","display_login":"humaidk2","url":"https://api.github.com/users/humaidk
[...]
-101
{"payload":{"action":"started"},"created_at":"2021-01-02T16:37:29Z","id":"14690746870","repo":{"url":"https://api.github.com/repos/okandavut/react-spotify-nowplaying","id":326215605,"name":"okandavut/react-spotify-nowplaying"},"actor":{"gravatar_id":"","display_login":"hasantezcan","url":"https://api.github.com/users/hasantezcan","id":32804505,"login":"hasantezcan","avatar_url":"https://avatars.githubusercontent.com/u/32804505?"},"public":1,"type":"WatchEvent"}
{"payload":{"action":" [...]
-112
{"payload":{"action":"started"},"created_at":"2021-01-02T16:37:30Z","id":"14690746899","repo":{"url":"https://api.github.com/repos/sentriz/gonic","id":178435468,"name":"sentriz/gonic"},"actor":{"gravatar_id":"","display_login":"nicholas-robertson","url":"https://api.github.com/users/nicholas-robertson","id":17681331,"login":"nicholas-robertson","avatar_url":"https://avatars.githubusercontent.com/u/17681331?"},"public":1,"type":"WatchEvent"}
{"payload":{"action":"started"},"created_at [...]
-122
{"payload":{"action":"started"},"created_at":"2021-01-02T16:37:30Z","org":{"gravatar_id":"","url":"https://api.github.com/orgs/netlify-labs","id":47546088,"login":"netlify-labs","avatar_url":"https://avatars.githubusercontent.com/u/47546088?"},"id":"14690746914","repo":{"url":"https://api.github.com/repos/netlify-labs/react-netlify-identity-widget","id":182606378,"name":"netlify-labs/react-netlify-identity-widget"},"actor":{"gravatar_id":"","display_login":"javaniecampbell","url":"ht
[...]
-169
{"payload":{"action":"started"},"created_at":"2021-01-02T16:37:32Z","org":{"gravatar_id":"","url":"https://api.github.com/orgs/microsoft","id":6154722,"login":"microsoft","avatar_url":"https://avatars.githubusercontent.com/u/6154722?"},"id":"14690747028","repo":{"url":"https://api.github.com/repos/microsoft/BotBuilder-Samples","id":68730444,"name":"microsoft/BotBuilder-Samples"},"actor":{"gravatar_id":"","display_login":"Yxnt","url":"https://api.github.com/users/Yxnt","id":10323352,";
[...]
+27 14690746717 WatchEvent leonardomso/33-js-concepts
+36 14690746732 WatchEvent odeke-em/drive
+46 14690746749 WatchEvent GO-LiFE/GoFIT_SDK_Android
+56 14690746773 WatchEvent MrXujiang/h5-Dooring
+86 14690746843 WatchEvent redsaph/cleartext
+98 14690746866 WatchEvent sherlock-project/sherlock
+101 14690746870 WatchEvent okandavut/react-spotify-nowplaying
+112 14690746899 WatchEvent sentriz/gonic
+122 14690746914 WatchEvent
netlify-labs/react-netlify-identity-widget
+169 14690747028 WatchEvent microsoft/BotBuilder-Samples
-- !gh_data_14 --
-{"payload":{"ref_type":"branch","pusher_type":"user","ref":"dependabot/npm_and_yarn/lodash-4.17.19"},"created_at":"2021-01-02T16:37:26Z","id":"14690746680","repo":{"url":"https://api.github.com/repos/megan777/calculator","id":212350500,"name":"megan777/calculator"},"actor":{"gravatar_id":"","display_login":"dependabot","url":"https://api.github.com/users/dependabot[bot]","id":49699333,"login":"dependabot[bot]","avatar_url":"https://avatars.githubusercontent.com/u/49699333?"},"type":"Dele
[...]
-{"payload":{"ref_type":"branch","pusher_type":"user","ref":"dependabot/npm_and_yarn/acorn-7.4.0"},"created_at":"2021-01-02T16:37:26Z","id":"14690746695","repo":{"url":"https://api.github.com/repos/megan777/calculator","id":212350500,"name":"megan777/calculator"},"actor":{"gravatar_id":"","display_login":"dependabot","url":"https://api.github.com/users/dependabot[bot]","id":49699333,"login":"dependabot[bot]","avatar_url":"https://avatars.githubusercontent.com/u/49699333?"},"type":"DeleteE
[...]
-{"payload":{"ref_type":"repository","pusher_type":"user","master_branch":"master","description":"Pratique
Bootstrap
Openclassroom"},"created_at":"2021-01-02T16:37:27Z","id":"14690746705","repo":{"url":"https://api.github.com/repos/Sonfresh/pratique-bootstrap","id":326225102,"name":"Sonfresh/pratique-bootstrap"},"actor":{"gravatar_id":"","display_login":"Sonfresh","url":"https://api.github.com/users/Sonfresh","id":40009609,"login":"Sonfresh","avatar_url":"https://avatars.githubusercontent
[...]
-{"payload":{"ref_type":"branch","pusher_type":"user","ref":"dependabot/npm_and_yarn/websocket-extensions-0.1.4"},"created_at":"2021-01-02T16:37:27Z","id":"14690746708","repo":{"url":"https://api.github.com/repos/megan777/calculator","id":212350500,"name":"megan777/calculator"},"actor":{"gravatar_id":"","display_login":"dependabot","url":"https://api.github.com/users/dependabot[bot]","id":49699333,"login":"dependabot[bot]","avatar_url":"https://avatars.githubusercontent.com/u/49699333?"},
[...]
-{"payload":{"ref_type":"tag","pusher_type":"user","master_branch":"master","description":"A
library for Frege
indexers","ref":"v_0.1"},"created_at":"2021-01-02T16:37:27Z","org":{"gravatar_id":"","url":"https://api.github.com/orgs/Software-Engineering-Jagiellonian","id":74735360,"login":"Software-Engineering-Jagiellonian","avatar_url":"https://avatars.githubusercontent.com/u/74735360?"},"id":"14690746727","repo":{"url":"https://api.github.com/repos/Software-Engineering-Jagiellonian/frege-
[...]
-{"payload":{"ref_type":"repository","pusher_type":"user","master_branch":"master"},"created_at":"2021-01-02T16:37:27Z","id":"14690746737","repo":{"url":"https://api.github.com/repos/TOtto91/orbital-debris","id":326225103,"name":"TOtto91/orbital-debris"},"actor":{"gravatar_id":"","display_login":"TOtto91","url":"https://api.github.com/users/TOtto91","id":54342679,"login":"TOtto91","avatar_url":"https://avatars.githubusercontent.com/u/54342679?"},"type":"CreateEvent","public":1}
-{"payload":{"ref_type":"tag","pusher_type":"user","ref":"flux-write-check-1ccffefc6f"},"created_at":"2021-01-02T16:37:27Z","id":"14690746750","repo":{"url":"https://api.github.com/repos/jimangel/auto-gitops","id":290091833,"name":"jimangel/auto-gitops"},"actor":{"gravatar_id":"","display_login":"jimangel","url":"https://api.github.com/users/jimangel","id":4601051,"login":"jimangel","avatar_url":"https://avatars.githubusercontent.com/u/4601051?"},"type":"DeleteEvent","public":1}
-{"payload":{"ref_type":"branch","pusher_type":"user","master_branch":"master","description":"Open
Source is hard. Show your
gratitude","ref":"emoji-conversion"},"created_at":"2021-01-02T16:37:27Z","id":"14690746754","repo":{"url":"https://api.github.com/repos/yeraydiazdiaz/shoutouts.dev","id":323309255,"name":"yeraydiazdiaz/shoutouts.dev"},"actor":{"gravatar_id":"","display_login":"yeraydiazdiaz","url":"https://api.github.com/users/yeraydiazdiaz","id":6739793,"login":"yeraydiazdiaz","ava
[...]
-{"payload":{"ref_type":"repository","pusher_type":"user","master_branch":"master","description":"BIPN145
Winter2020"},"created_at":"2021-01-02T16:37:27Z","id":"14690746759","repo":{"url":"https://api.github.com/repos/mwchu/BIPN145","id":326225104,"name":"mwchu/BIPN145"},"actor":{"gravatar_id":"","display_login":"mwchu","url":"https://api.github.com/users/mwchu","id":76878377,"login":"mwchu","avatar_url":"https://avatars.githubusercontent.com/u/76878377?"},"type":"CreateEvent","public":1}
-{"payload":{"ref_type":"branch","pusher_type":"user","master_branch":"master","description":"Simple
Python 3 CLI script for retrieving Wrocław MPK trams and buses real-time
location","ref":"fill-readme"},"created_at":"2021-01-02T16:37:28Z","id":"14690746775","repo":{"url":"https://api.github.com/repos/emkor/mpyk","id":186781673,"name":"emkor/mpyk"},"actor":{"gravatar_id":"","display_login":"emkor","url":"https://api.github.com/users/emkor","id":4871763,"login":"emkor","avatar_url":"https
[...]
+user
+user
+user
+user
+user
+user
+user
+user
+user
+user
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
