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.

Sign up for GitHub

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

Jump to bottom

Add ability to merge using multiple columns in JOIN condition #5838

Merged
merged 27 commits into from Sep 28, 2021
Merged

Add ability to merge using multiple columns in JOIN condition #5838

merged 27 commits into from Sep 28, 2021

Commits on Apr 26, 2021

  1. fix #5767 issue with DataFrame Merge method

    Alexey Smirnov committed Apr 26, 2021
    Copy the full SHA
    c527c21 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2021

  1. Merge pull request #1 from dotnet/main 

    Merge latest changes from dotnet/machinelearning
    Aleksei Smirnov committed Apr 29, 2021
    Copy the full SHA
    a38fdf5 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2021

  1. Merge pull request #2 from dotnet/main 

    Back merge from base repository
    Aleksei Smirnov committed May 27, 2021
    Copy the full SHA
    e5f5eeb View commit details
    Browse the repository at this point in the history

Commits on May 28, 2021

  1. #5820 Extend DataFrame GroupBy operations

    Alexey Smirnov committed May 28, 2021
    Copy the full SHA
    0580710 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2021

  1. #5820 fix code review findings

    Alexey Smirnov committed May 29, 2021
    Copy the full SHA
    f7658b2 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2021

  1. Avoid code duplication in Merge DataFrame method (#5657)

    Alexey Smirnov committed Jun 2, 2021
    Copy the full SHA
    dc8daf0 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2021

  1. Merge pull request #4 from dotnet/main 

    Backmerge latest changes from dotnet/machinelearning
    Aleksei Smirnov committed Jun 4, 2021
    Copy the full SHA
    b36fbee View commit details
    Browse the repository at this point in the history

  2. Add non generic DataFrame Merge method (#5657)

    Alexey Smirnov committed Jun 4, 2021
    Copy the full SHA
    a4735ce View commit details
    Browse the repository at this point in the history

  3. Add support for multi columns join in DataFrame (#5657)

    Alexey Smirnov committed Jun 4, 2021
    Copy the full SHA
    7893bfd View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2021

  1. Fix failing tests for inner, left and right joins with nulls

    Alexey Smirnov committed Jun 5, 2021
    Copy the full SHA
    28fcda3 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. #5657 fix DataFrame outer join failing tests

    Alexey Smirnov committed Jun 7, 2021
    Copy the full SHA
    5da5a37 View commit details
    Browse the repository at this point in the history

  2. rebase to the latest main

    Alexey Smirnov committed Jun 7, 2021
    Copy the full SHA
    040f6bb View commit details
    Browse the repository at this point in the history

  3. Avoid code duplication in Merge DataFrame method (#5657)

    Alexey Smirnov committed Jun 7, 2021
    Copy the full SHA
    c1b7969 View commit details
    Browse the repository at this point in the history

  4. Add non generic DataFrame Merge method (#5657)

    Alexey Smirnov committed Jun 7, 2021
    Copy the full SHA
    bd22036 View commit details
    Browse the repository at this point in the history

  5. Add support for multi columns join in DataFrame (#5657)

    Alexey Smirnov committed Jun 7, 2021
    Copy the full SHA
    d2d5f36 View commit details
    Browse the repository at this point in the history

  6. Fix failing tests for inner, left and right joins with nulls

    Alexey Smirnov committed Jun 7, 2021
    Copy the full SHA
    0494f7c View commit details
    Browse the repository at this point in the history

  7. #5657 fix DataFrame outer join failing tests

    Alexey Smirnov committed Jun 7, 2021
    Copy the full SHA
    976351c View commit details
    Browse the repository at this point in the history

  8. #5657 fix merge issues

    Alexey Smirnov committed Jun 7, 2021
    Copy the full SHA
    b5bff6c View commit details
    Browse the repository at this point in the history

  9. Merge branch 'feature/5657_dataframe_merge_multiple_columns' of https… 

    …://github.com/asmirnov82/machinelearning into feature/5657_dataframe_merge_multiple_columns

# Conflicts:
#	src/Microsoft.Data.Analysis/DataFrame.cs
#	src/Microsoft.Data.Analysis/GroupBy.cs
#	test/Microsoft.Data.Analysis.Tests/DataFrameGroupByTests.cs
    Alexey Smirnov committed Jun 7, 2021
    Copy the full SHA
    cbd02dc View commit details
    Browse the repository at this point in the history

  10. Minor changes #5657

    Alexey Smirnov committed Jun 7, 2021
    Copy the full SHA
    1940f3a View commit details
    Browse the repository at this point in the history

  11. Add self explanatory exception text (#5657)

    Alexey Smirnov committed Jun 7, 2021
    Copy the full SHA
    4232fee View commit details
    Browse the repository at this point in the history

  12. Add Asserts to new unit tests (#5657)

    Alexey Smirnov committed Jun 7, 2021
    Copy the full SHA
    33a99c3 View commit details
    Browse the repository at this point in the history

  13. Minor changes (#5657)

    Alexey Smirnov committed Jun 7, 2021
    Copy the full SHA
    12a5833 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2021

  1. Fix right merge by 3-columns test fails

    Alexey Smirnov committed Jun 8, 2021
    Copy the full SHA
    22fc3e2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5 from asmirnov82/feature/5657_dataframe_merge_mu… 

    …ltiple_columns

Feature/5657 dataframe merge multiple columns
    Aleksei Smirnov committed Jun 8, 2021
    Copy the full SHA
    989711b View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2021

  1. fixed typos (#5657)

    Alexey Smirnov committed Sep 4, 2021
    Copy the full SHA
    2f22cd7 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2021

  1. Merge pull request #6 from dotnet/main 

    Backmerge latest changes from original repo
    Aleksei Smirnov committed Sep 19, 2021
    Copy the full SHA
    3396554 View commit details
    Browse the repository at this point in the history