Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Change C style casts to C++ style (Part 5) #11688

Closed
wants to merge 1 commit into from
Closed

Conversation

aditi-pandit
Copy link
Collaborator

@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Nov 28, 2024
Copy link

netlify bot commented Nov 28, 2024

Deploy Preview for meta-velox canceled.

Name Link
🔨 Latest commit 0a944dd
🔍 Latest deploy log https://app.netlify.com/sites/meta-velox/deploys/675fc9f1da536d000843e369

@aditi-pandit aditi-pandit force-pushed the cve5 branch 3 times, most recently from b44c8ff to 1bd6cd3 Compare November 28, 2024 08:35
@aditi-pandit aditi-pandit marked this pull request as ready for review November 28, 2024 09:06
@aditi-pandit aditi-pandit force-pushed the cve5 branch 2 times, most recently from 09807e0 to f888c1a Compare November 28, 2024 15:33
@aditi-pandit aditi-pandit requested a review from czentgr November 28, 2024 15:42
Copy link
Collaborator

@czentgr czentgr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@@ -1,9 +1,26 @@
/*
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pedroerp : I was working with some of the files in the velox/tpch/gen/dbgen folder and there were some inconsistencies in the Facebook header placements. Some files (e.g. file https://github.com/facebookincubator/velox/blob/main/velox/tpch/gen/dbgen/include/dbgen/dss.h) had them, and some not. While working on this PR, as per instructions I did fix the headers I touched, but I wonder if the placement of the copyright is okay from a licensing perspective.

I am keen to hear your take on it. wdyt ?

@@ -398,7 +400,7 @@ char** mk_ascdate(void) {
dss_time_t t;
DSS_HUGE i;

m = (char**)malloc((size_t)(TOTDATE * sizeof(char*)));
m = reinterpret_cast<char**>(malloc((size_t)(TOTDATE * sizeof(char*))));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missed one C-style cast in the malloc.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch. Done.

@aditi-pandit aditi-pandit force-pushed the cve5 branch 6 times, most recently from 9dde6f0 to 7b15200 Compare December 6, 2024 09:46
@aditi-pandit aditi-pandit force-pushed the cve5 branch 2 times, most recently from 9cd2060 to 9bdf1cb Compare December 9, 2024 17:55
@aditi-pandit aditi-pandit force-pushed the cve5 branch 4 times, most recently from f57c4ae to 5f4a6ba Compare December 10, 2024 18:42
Copy link
Collaborator

@majetideepak majetideepak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @aditi-pandit

@majetideepak majetideepak added the ready-to-merge PR that have been reviewed and are ready for merging. PRs with this tag notify the Velox Meta oncall label Dec 10, 2024
#define TPCH_QUERY(id) reinterpret_cast<const char*>(TPCH_QUERIES_##id)
#define TPCH_ANSWER_SF1(id) reinterpret_cast<const char*>(TPCH_ANSWERS_SF1_##id)
#define TPCH_ANSWER_SF0_1(id) reinterpret_cast<const char*>(TPCH_ANSWERS_SF0_1_##id)
#define TPCH_ANSWER_SF0_01(id) reinterpret_cast<const char*>(TPCH_ANSWERS_SF0_01_##id)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aditi-pandit i noticed you removed the undefs. Let's keep them to avoid leaking the pragmas.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved the defines and undefs closer to use, so that the scope is restricted to the minimum.

@facebook-github-bot
Copy link
Contributor

@bikramSingh91 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@majetideepak
Copy link
Collaborator

@bikramSingh91 can you please re-import this? Thanks!

@facebook-github-bot
Copy link
Contributor

@bikramSingh91 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@bikramSingh91
Copy link
Contributor

@aditi-pandit
There are a couple of format issues highlighted by internal linter, posting them here, can you please make the suggested changes? Thanks!

File: velox/tpch/gen/dbgen/include/tpch_constants.hpp

lines 1003 - 1012


-    TPCH_QUERY(q01), TPCH_QUERY(q02),
-    TPCH_QUERY(q03), TPCH_QUERY(q04),
-    TPCH_QUERY(q05), TPCH_QUERY(q06),
-    TPCH_QUERY(q07), TPCH_QUERY(q08),
-    TPCH_QUERY(q09), TPCH_QUERY(q10),
-    TPCH_QUERY(q11), TPCH_QUERY(q12),
-    TPCH_QUERY(q13), TPCH_QUERY(q14),
-    TPCH_QUERY(q15), TPCH_QUERY(q16),
-    TPCH_QUERY(q17), TPCH_QUERY(q18),
-    TPCH_QUERY(q19), TPCH_QUERY(q20),
+    TPCH_QUERY(q01), TPCH_QUERY(q02), TPCH_QUERY(q03), TPCH_QUERY(q04),
+    TPCH_QUERY(q05), TPCH_QUERY(q06), TPCH_QUERY(q07), TPCH_QUERY(q08),
+    TPCH_QUERY(q09), TPCH_QUERY(q10), TPCH_QUERY(q11), TPCH_QUERY(q12),
+    TPCH_QUERY(q13), TPCH_QUERY(q14), TPCH_QUERY(q15), TPCH_QUERY(q16),
+    TPCH_QUERY(q17), TPCH_QUERY(q18), TPCH_QUERY(q19), TPCH_QUERY(q20),

line 2832

-#define TPCH_ANSWER_SF0_01(id) reinterpret_cast<const char*>(TPCH_ANSWERS_SF0_01_##id)
+#define TPCH_ANSWER_SF0_01(id) \
+  reinterpret_cast<const char*>(TPCH_ANSWERS_SF0_01_##id)

lines 2835 - 2845

-    TPCH_ANSWER_SF0_01(q01), TPCH_ANSWER_SF0_01(q02),
-    TPCH_ANSWER_SF0_01(q03), TPCH_ANSWER_SF0_01(q04),
-    TPCH_ANSWER_SF0_01(q05), TPCH_ANSWER_SF0_01(q06),
-    TPCH_ANSWER_SF0_01(q07), TPCH_ANSWER_SF0_01(q08),
-    TPCH_ANSWER_SF0_01(q09), TPCH_ANSWER_SF0_01(q10),
-    TPCH_ANSWER_SF0_01(q11), TPCH_ANSWER_SF0_01(q12),
-    TPCH_ANSWER_SF0_01(q13), TPCH_ANSWER_SF0_01(q14),
-    TPCH_ANSWER_SF0_01(q15), TPCH_ANSWER_SF0_01(q16),
-    TPCH_ANSWER_SF0_01(q17), TPCH_ANSWER_SF0_01(q18),
-    TPCH_ANSWER_SF0_01(q19), TPCH_ANSWER_SF0_01(q20),
-    TPCH_ANSWER_SF0_01(q21), TPCH_ANSWER_SF0_01(q22)};
+    TPCH_ANSWER_SF0_01(q01), TPCH_ANSWER_SF0_01(q02), TPCH_ANSWER_SF0_01(q03),
+    TPCH_ANSWER_SF0_01(q04), TPCH_ANSWER_SF0_01(q05), TPCH_ANSWER_SF0_01(q06),
+    TPCH_ANSWER_SF0_01(q07), TPCH_ANSWER_SF0_01(q08), TPCH_ANSWER_SF0_01(q09),
+    TPCH_ANSWER_SF0_01(q10), TPCH_ANSWER_SF0_01(q11), TPCH_ANSWER_SF0_01(q12),
+    TPCH_ANSWER_SF0_01(q13), TPCH_ANSWER_SF0_01(q14), TPCH_ANSWER_SF0_01(q15),
+    TPCH_ANSWER_SF0_01(q16), TPCH_ANSWER_SF0_01(q17), TPCH_ANSWER_SF0_01(q18),
+    TPCH_ANSWER_SF0_01(q19), TPCH_ANSWER_SF0_01(q20), TPCH_ANSWER_SF0_01(q21),
+    TPCH_ANSWER_SF0_01(q22)};

line 13430

-#define TPCH_ANSWER_SF0_1(id) reinterpret_cast<const char*>(TPCH_ANSWERS_SF0_1_##id)
+#define TPCH_ANSWER_SF0_1(id) \
+  reinterpret_cast<const char*>(TPCH_ANSWERS_SF0_1_##id)

lines 13433 - 13443

-    TPCH_ANSWER_SF0_1(q01), TPCH_ANSWER_SF0_1(q02),
-    TPCH_ANSWER_SF0_1(q03), TPCH_ANSWER_SF0_1(q04),
-    TPCH_ANSWER_SF0_1(q05), TPCH_ANSWER_SF0_1(q06),
-    TPCH_ANSWER_SF0_1(q07), TPCH_ANSWER_SF0_1(q08),
-    TPCH_ANSWER_SF0_1(q09), TPCH_ANSWER_SF0_1(q10),
-    TPCH_ANSWER_SF0_1(q11), TPCH_ANSWER_SF0_1(q12),
-    TPCH_ANSWER_SF0_1(q13), TPCH_ANSWER_SF0_1(q14),
-    TPCH_ANSWER_SF0_1(q15), TPCH_ANSWER_SF0_1(q16),
-    TPCH_ANSWER_SF0_1(q17), TPCH_ANSWER_SF0_1(q18),
-    TPCH_ANSWER_SF0_1(q19), TPCH_ANSWER_SF0_1(q20),
-    TPCH_ANSWER_SF0_1(q21), TPCH_ANSWER_SF0_1(q22)};
+    TPCH_ANSWER_SF0_1(q01), TPCH_ANSWER_SF0_1(q02), TPCH_ANSWER_SF0_1(q03),
+    TPCH_ANSWER_SF0_1(q04), TPCH_ANSWER_SF0_1(q05), TPCH_ANSWER_SF0_1(q06),
+    TPCH_ANSWER_SF0_1(q07), TPCH_ANSWER_SF0_1(q08), TPCH_ANSWER_SF0_1(q09),
+    TPCH_ANSWER_SF0_1(q10), TPCH_ANSWER_SF0_1(q11), TPCH_ANSWER_SF0_1(q12),
+    TPCH_ANSWER_SF0_1(q13), TPCH_ANSWER_SF0_1(q14), TPCH_ANSWER_SF0_1(q15),
+    TPCH_ANSWER_SF0_1(q16), TPCH_ANSWER_SF0_1(q17), TPCH_ANSWER_SF0_1(q18),
+    TPCH_ANSWER_SF0_1(q19), TPCH_ANSWER_SF0_1(q20), TPCH_ANSWER_SF0_1(q21),
+    TPCH_ANSWER_SF0_1(q22)};

lines 60731 - 60741

-    TPCH_ANSWER_SF1(q01), TPCH_ANSWER_SF1(q02),
-    TPCH_ANSWER_SF1(q03), TPCH_ANSWER_SF1(q04),
-    TPCH_ANSWER_SF1(q05), TPCH_ANSWER_SF1(q06),
-    TPCH_ANSWER_SF1(q07), TPCH_ANSWER_SF1(q08),
-    TPCH_ANSWER_SF1(q09), TPCH_ANSWER_SF1(q10),
-    TPCH_ANSWER_SF1(q11), TPCH_ANSWER_SF1(q12),
-    TPCH_ANSWER_SF1(q13), TPCH_ANSWER_SF1(q14),
-    TPCH_ANSWER_SF1(q15), TPCH_ANSWER_SF1(q16),
-    TPCH_ANSWER_SF1(q17), TPCH_ANSWER_SF1(q18),
-    TPCH_ANSWER_SF1(q19), TPCH_ANSWER_SF1(q20),
-    TPCH_ANSWER_SF1(q21), TPCH_ANSWER_SF1(q22)};
+    TPCH_ANSWER_SF1(q01), TPCH_ANSWER_SF1(q02), TPCH_ANSWER_SF1(q03),
+    TPCH_ANSWER_SF1(q04), TPCH_ANSWER_SF1(q05), TPCH_ANSWER_SF1(q06),
+    TPCH_ANSWER_SF1(q07), TPCH_ANSWER_SF1(q08), TPCH_ANSWER_SF1(q09),
+    TPCH_ANSWER_SF1(q10), TPCH_ANSWER_SF1(q11), TPCH_ANSWER_SF1(q12),
+    TPCH_ANSWER_SF1(q13), TPCH_ANSWER_SF1(q14), TPCH_ANSWER_SF1(q15),
+    TPCH_ANSWER_SF1(q16), TPCH_ANSWER_SF1(q17), TPCH_ANSWER_SF1(q18),
+    TPCH_ANSWER_SF1(q19), TPCH_ANSWER_SF1(q20), TPCH_ANSWER_SF1(q21),
+    TPCH_ANSWER_SF1(q22)};

@aditi-pandit
Copy link
Collaborator Author

Thanks @bikramSingh91. Have made the changes. PTAL.

@facebook-github-bot
Copy link
Contributor

@bikramSingh91 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@bikramSingh91
Copy link
Contributor

@aditi-pandit Unfortunately after you fixed the previous format changes, some more popped up. My guess is that format rules for macros is a bit wonky. Pasting them here again, hope it'll be the last of it.

file: fbcode/velox/tpch/gen/dbgen/include/tpch_constants.hpp

line 2827

-#define TPCH_ANSWER_SF0_01(id) reinterpret_cast<const char*>(TPCH_ANSWERS_SF0_01_##id)
+#define TPCH_ANSWER_SF0_01(id) \
+  reinterpret_cast<const char*>(TPCH_ANSWERS_SF0_01_##id)

line 2830 - 2835

-    TPCH_ANSWER_SF0_01(q01), TPCH_ANSWER_SF0_01(q02), TPCH_ANSWER_SF0_01(q03), TPCH_ANSWER_SF0_01(q04),
-    TPCH_ANSWER_SF0_01(q05), TPCH_ANSWER_SF0_01(q06), TPCH_ANSWER_SF0_01(q07), TPCH_ANSWER_SF0_01(q08),
-    TPCH_ANSWER_SF0_01(q09), TPCH_ANSWER_SF0_01(q10), TPCH_ANSWER_SF0_01(q11), TPCH_ANSWER_SF0_01(q12),
-    TPCH_ANSWER_SF0_01(q13), TPCH_ANSWER_SF0_01(q14), TPCH_ANSWER_SF0_01(q15), TPCH_ANSWER_SF0_01(q16),
-    TPCH_ANSWER_SF0_01(q17), TPCH_ANSWER_SF0_01(q18), TPCH_ANSWER_SF0_01(q19), TPCH_ANSWER_SF0_01(q20),
-    TPCH_ANSWER_SF0_01(q21), TPCH_ANSWER_SF0_01(q22)};
+    TPCH_ANSWER_SF0_01(q01), TPCH_ANSWER_SF0_01(q02), TPCH_ANSWER_SF0_01(q03),
+    TPCH_ANSWER_SF0_01(q04), TPCH_ANSWER_SF0_01(q05), TPCH_ANSWER_SF0_01(q06),
+    TPCH_ANSWER_SF0_01(q07), TPCH_ANSWER_SF0_01(q08), TPCH_ANSWER_SF0_01(q09),
+    TPCH_ANSWER_SF0_01(q10), TPCH_ANSWER_SF0_01(q11), TPCH_ANSWER_SF0_01(q12),
+    TPCH_ANSWER_SF0_01(q13), TPCH_ANSWER_SF0_01(q14), TPCH_ANSWER_SF0_01(q15),
+    TPCH_ANSWER_SF0_01(q16), TPCH_ANSWER_SF0_01(q17), TPCH_ANSWER_SF0_01(q18),
+    TPCH_ANSWER_SF0_01(q19), TPCH_ANSWER_SF0_01(q20), TPCH_ANSWER_SF0_01(q21),
+    TPCH_ANSWER_SF0_01(q22)};

line 13420

-#define TPCH_ANSWER_SF0_1(id) reinterpret_cast<const char*>(TPCH_ANSWERS_SF0_1_##id)
+#define TPCH_ANSWER_SF0_1(id) \
+  reinterpret_cast<const char*>(TPCH_ANSWERS_SF0_1_##id)

line 13423 - 13428

-    TPCH_ANSWER_SF0_1(q01), TPCH_ANSWER_SF0_1(q02), TPCH_ANSWER_SF0_1(q03), TPCH_ANSWER_SF0_1(q04),
-    TPCH_ANSWER_SF0_1(q05), TPCH_ANSWER_SF0_1(q06), TPCH_ANSWER_SF0_1(q07), TPCH_ANSWER_SF0_1(q08),
-    TPCH_ANSWER_SF0_1(q09), TPCH_ANSWER_SF0_1(q10), TPCH_ANSWER_SF0_1(q11), TPCH_ANSWER_SF0_1(q12),
-    TPCH_ANSWER_SF0_1(q13), TPCH_ANSWER_SF0_1(q14), TPCH_ANSWER_SF0_1(q15), TPCH_ANSWER_SF0_1(q16),
-    TPCH_ANSWER_SF0_1(q17), TPCH_ANSWER_SF0_1(q18), TPCH_ANSWER_SF0_1(q19), TPCH_ANSWER_SF0_1(q20),
-    TPCH_ANSWER_SF0_1(q21), TPCH_ANSWER_SF0_1(q22)};
+    TPCH_ANSWER_SF0_1(q01), TPCH_ANSWER_SF0_1(q02), TPCH_ANSWER_SF0_1(q03),
+    TPCH_ANSWER_SF0_1(q04), TPCH_ANSWER_SF0_1(q05), TPCH_ANSWER_SF0_1(q06),
+    TPCH_ANSWER_SF0_1(q07), TPCH_ANSWER_SF0_1(q08), TPCH_ANSWER_SF0_1(q09),
+    TPCH_ANSWER_SF0_1(q10), TPCH_ANSWER_SF0_1(q11), TPCH_ANSWER_SF0_1(q12),
+    TPCH_ANSWER_SF0_1(q13), TPCH_ANSWER_SF0_1(q14), TPCH_ANSWER_SF0_1(q15),
+    TPCH_ANSWER_SF0_1(q16), TPCH_ANSWER_SF0_1(q17), TPCH_ANSWER_SF0_1(q18),
+    TPCH_ANSWER_SF0_1(q19), TPCH_ANSWER_SF0_1(q20), TPCH_ANSWER_SF0_1(q21),
+    TPCH_ANSWER_SF0_1(q22)};

line 60716 - 60721

-    TPCH_ANSWER_SF1(q01), TPCH_ANSWER_SF1(q02), TPCH_ANSWER_SF1(q03), TPCH_ANSWER_SF1(q04),
-    TPCH_ANSWER_SF1(q05), TPCH_ANSWER_SF1(q06), TPCH_ANSWER_SF1(q07), TPCH_ANSWER_SF1(q08),
-    TPCH_ANSWER_SF1(q09), TPCH_ANSWER_SF1(q10), TPCH_ANSWER_SF1(q11), TPCH_ANSWER_SF1(q12),
-    TPCH_ANSWER_SF1(q13), TPCH_ANSWER_SF1(q14), TPCH_ANSWER_SF1(q15), TPCH_ANSWER_SF1(q16),
-    TPCH_ANSWER_SF1(q17), TPCH_ANSWER_SF1(q18), TPCH_ANSWER_SF1(q19), TPCH_ANSWER_SF1(q20),
-    TPCH_ANSWER_SF1(q21), TPCH_ANSWER_SF1(q22)};
+    TPCH_ANSWER_SF1(q01), TPCH_ANSWER_SF1(q02), TPCH_ANSWER_SF1(q03),
+    TPCH_ANSWER_SF1(q04), TPCH_ANSWER_SF1(q05), TPCH_ANSWER_SF1(q06),
+    TPCH_ANSWER_SF1(q07), TPCH_ANSWER_SF1(q08), TPCH_ANSWER_SF1(q09),
+    TPCH_ANSWER_SF1(q10), TPCH_ANSWER_SF1(q11), TPCH_ANSWER_SF1(q12),
+    TPCH_ANSWER_SF1(q13), TPCH_ANSWER_SF1(q14), TPCH_ANSWER_SF1(q15),
+    TPCH_ANSWER_SF1(q16), TPCH_ANSWER_SF1(q17), TPCH_ANSWER_SF1(q18),
+    TPCH_ANSWER_SF1(q19), TPCH_ANSWER_SF1(q20), TPCH_ANSWER_SF1(q21),
+    TPCH_ANSWER_SF1(q22)};

@aditi-pandit
Copy link
Collaborator Author

@bikramSingh91 : Did the next round of linter fixes :( Hope this resolves the issues. Thanks for your patience with this.

@facebook-github-bot
Copy link
Contributor

@bikramSingh91 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@bikramSingh91
Copy link
Contributor

One more popped up, this would be the last for sure!
I realized a bit late that I could just submit local patches internally to re-trigger the checks. So eventually did that for this last linter error, and this seems to clear all. Thanks for tagging along with this stream of linter updates. Appreciate your patience!

lines 60719 - 60720

-#define TPCH_ANSWER_SF1(id) \
-  reinterpret_cast<const char*>(TPCH_ANSWERS_SF1_##id)
+#define TPCH_ANSWER_SF1(id) reinterpret_cast<const char*>(TPCH_ANSWERS_SF1_##id)

@aditi-pandit
Copy link
Collaborator Author

@bikramSingh91 : Sounds like you don't need the linter fix from me. I was thinking that I will push a commit in any case, but don't want to cause further complications in the merge process.

Definitely ping me if you need anything else. I've sent you a slack as well.

@aditi-pandit
Copy link
Collaborator Author

Thanks @bikramSingh91 for your message.

Have updated the code accordingly.

@facebook-github-bot
Copy link
Contributor

@bikramSingh91 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-bot
Copy link
Contributor

@bikramSingh91 merged this pull request in 4c6ab14.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. Merged ready-to-merge PR that have been reviewed and are ready for merging. PRs with this tag notify the Velox Meta oncall
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants