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

fix: batch: compile warning that check a long for null #1408 #1870

Merged
merged 14 commits into from
May 30, 2022

Conversation

Ivyee17
Copy link
Contributor

@Ivyee17 Ivyee17 commented May 23, 2022

close #1408

@github-actions github-actions bot added the batch-engine openmldb batch(offline) engine label May 23, 2022
@github-actions
Copy link
Contributor

github-actions bot commented May 23, 2022

SDK Test Report

  75 files    75 suites   6m 9s ⏱️
163 tests 161 ✔️ 2 💤 0
204 runs  202 ✔️ 2 💤 0

Results for commit 3bce8ef.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actions bot commented May 23, 2022

Linux Test Report

       57 files       193 suites   1h 3m 15s ⏱️
  8 673 tests   8 669 ✔️ 4 💤 0
12 744 runs  12 740 ✔️ 4 💤 0

Results for commit 3bce8ef.

♻️ This comment has been updated with latest results.

@tobegit3hub tobegit3hub self-requested a review May 24, 2022 02:59
@tobegit3hub tobegit3hub self-assigned this May 24, 2022
@tobegit3hub
Copy link
Collaborator

There are some test failures. Please make sure you can run tests in local @Ivyee17 .

@Ivyee17
Copy link
Contributor Author

Ivyee17 commented May 24, 2022

May be I will try it once the issue is assigned to me. I misunderstand that this issue has already assigned to me. 😂

@dl239
Copy link
Collaborator

dl239 commented May 25, 2022

May be I will try it once the issue is assigned to me. I misunderstand that this issue has already assigned to me. 😂

hi @Ivyee17 the issue have been assigned to you.

@codecov
Copy link

codecov bot commented May 25, 2022

Codecov Report

Merging #1870 (3bce8ef) into main (908e9ed) will increase coverage by 0.02%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #1870      +/-   ##
============================================
+ Coverage     75.69%   75.72%   +0.02%     
  Complexity      347      347              
============================================
  Files           613      613              
  Lines        117059   117059              
  Branches       1024     1008      -16     
============================================
+ Hits          88613    88640      +27     
+ Misses        28237    28210      -27     
  Partials        209      209              
Impacted Files Coverage Δ
...4paradigm/openmldb/batch/nodes/WindowAggPlan.scala 63.87% <ø> (ø)
src/catalog/tablet_catalog.cc 73.77% <0.00%> (-0.87%) ⬇️
src/catalog/client_manager.cc 42.20% <0.00%> (-0.29%) ⬇️
hybridse/src/vm/runner.cc 67.75% <0.00%> (-0.04%) ⬇️
hybridse/src/codec/fe_row_codec.cc 78.64% <0.00%> (ø)
src/nameserver/name_server_impl.cc 42.86% <0.00%> (+0.01%) ⬆️
src/sdk/sql_cluster_router.cc 54.97% <0.00%> (+0.12%) ⬆️
src/tablet/tablet_impl.cc 59.44% <0.00%> (+0.17%) ⬆️
src/client/tablet_client.cc 55.33% <0.00%> (+0.22%) ⬆️
src/zk/zk_client.cc 84.07% <0.00%> (+0.52%) ⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 908e9ed...3bce8ef. Read the comment docs.

@Ivyee17
Copy link
Contributor Author

Ivyee17 commented May 26, 2022

It has been correct now. @dl239

@Ivyee17
Copy link
Contributor Author

Ivyee17 commented May 27, 2022

If there is any question about this issue, feel free to contact me. @vagetablechicken @tobegit3hub

@@ -730,7 +730,7 @@ object WindowAggPlan {



def isValidOrder(key: Long): Boolean = {
def isValidOrder(key: java.lang.Long): Boolean = {
Copy link
Collaborator

Choose a reason for hiding this comment

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

isValidOrder always check the orderKey from val orderKey = computer.extractKey(row).
But extractKey returns scala Long, you should make it return java Long too.

Copy link
Contributor Author

@Ivyee17 Ivyee17 May 28, 2022

Choose a reason for hiding this comment

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

There are some test failures. Please make sure you can run tests in local @Ivyee17 .

I've already made changes in the previous PR, it will cause test failures, as @dl239 said before. @vagetablechicken

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The failure is about delete-extract-key, if changing it to java.lang.Lang too, then this test will fail. Searching a key which is deleted before will be true, not false. I wonder if there's mistakes in extractKey function. Besides, I do think it's far beyond what should be done in this PR. I just need to resolve the warning log, not the complete process, right? Another issue and pr should be taken instead of this issue!!

Copy link
Collaborator

@tobegit3hub tobegit3hub left a comment

Choose a reason for hiding this comment

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

LGTM

@vagetablechicken vagetablechicken enabled auto-merge (squash) May 30, 2022 09:09
@vagetablechicken
Copy link
Collaborator

After check, the pr should only fix isValidOrder argument type. We want it to be java Long.
Actually we only pass scala Long to isValidOrder, the mistake will be tracked by another issue #1903 .

@vagetablechicken vagetablechicken merged commit 18c21ae into 4paradigm:main May 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
batch-engine openmldb batch(offline) engine wait for contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

batch: compile warning that check a long for null
4 participants