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

merge/join: exclude sys signals #120

Merged
merged 1 commit into from
Jul 22, 2024
Merged

merge/join: exclude sys signals #120

merged 1 commit into from
Jul 22, 2024

Conversation

skshetry
Copy link
Member

@skshetry skshetry commented Jul 22, 2024

Fixes #114.

For now, I am going to ignore sys signals even if settings(sys=True) is passed.

@skshetry skshetry requested review from rlamy, ilongin and dmpetrov July 22, 2024 06:00
Copy link

Deploying datachain-documentation with  Cloudflare Pages  Cloudflare Pages

Latest commit: cd7e284
Status: ✅  Deploy successful!
Preview URL: https://8141dc46.datachain-documentation.pages.dev
Branch Preview URL: https://merge-sys.datachain-documentation.pages.dev

View logs

Copy link

codecov bot commented Jul 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.70%. Comparing base (c3ea4b3) to head (cd7e284).

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #120      +/-   ##
==========================================
+ Coverage   85.69%   85.70%   +0.01%     
==========================================
  Files          93       93              
  Lines        9477     9485       +8     
  Branches     1891     1893       +2     
==========================================
+ Hits         8121     8129       +8     
  Misses       1024     1024              
  Partials      332      332              
Flag Coverage Δ
datachain 85.64% <100.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@dmpetrov dmpetrov left a comment

Choose a reason for hiding this comment

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

THank you for quick turnaround! Really appreciate that.

There is a question about exposed sys signals.

@@ -92,7 +92,7 @@ def test_merge_similar_objects(catalog):
rname = "qq"
ch = ch1.merge(ch2, "emp.person.name", rname=rname)

assert list(ch.signals_schema.values.keys()) == ["emp", rname + "emp"]
assert list(ch.signals_schema.values.keys()) == ["sys", "emp", rname + "emp"]
Copy link
Member

Choose a reason for hiding this comment

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

Are we exposing sys to user? We shouldn't .

Copy link
Member Author

@skshetry skshetry Jul 22, 2024

Choose a reason for hiding this comment

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

signals_schema always include sys signals, and signals_schema is not public.

So, no, it's not exposed to users.

Copy link
Member

Choose a reason for hiding this comment

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

Great! Accepting the change.

@@ -116,7 +116,13 @@ def test_merge_values(catalog):

ch = ch1.merge(ch2, "id")

assert list(ch.signals_schema.values.keys()) == ["id", "descr", "right_id", "time"]
assert list(ch.signals_schema.values.keys()) == [
"sys",
Copy link
Member

Choose a reason for hiding this comment

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

The same. User should never see sys id (when it was not requested).

Copy link
Member

@dmpetrov dmpetrov left a comment

Choose a reason for hiding this comment

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

@skshetry thank you again! It was super quick 🚀

@skshetry
Copy link
Member Author

I'll wait for a review from @rlamy and @ilongin.

Copy link
Contributor

@ilongin ilongin left a comment

Choose a reason for hiding this comment

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

LGTM

@skshetry skshetry merged commit 0591dcf into main Jul 22, 2024
19 checks passed
@skshetry skshetry deleted the merge-sys branch July 22, 2024 09:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

sys__id breaks merge operations
4 participants