Skip to content

Conversation

Carreau
Copy link

@Carreau Carreau commented May 13, 2024

This is the commit message of the commit at the tip of this branch:


Rewritten branch Empty commit.

This is an empty commit, it is kept for information purposes.

This is a rewritten branch, that squash the content of PR #142 into a
single commit (keeping a merge commit).

Due to the merkel tree nature of git, all the subsequent commits have
been rewritten, have a different hash and so it will need a force push.

For completeness here is the current list of commits on main that have
been rewritten and their new counterpart:

old new
e1e1f82 7b3c3a7 : Python 3.12 build support (#221)
a32cef3 2abdf59 : Update vcpkg baseline (#209)
8bae523 c51a86b : Merge pull request #189 from Point72/pavithraes/fix-links
0964fad 7a25f45 : Merge pull request #219 from Point72/wrr/fix_ws_json_mapper
755debf cc60b87 : Merge pull request #191 from Point72/ac/fix_to_json_parsing_floats
5c7e55f ba90a02 : Merge pull request #200 from Point72/tkp/docs
2568689 abcd307 : Move websocket example after merge
f9b7e62 da4d5e3 : fix format changes that will now result in lint failures
687dc2e d6479c5 : Upgrade CSP to C++20; build websocket against C++17; rename .hi files (#224)
9b442d5 8adb1a7 : Upgrade baseline in vcpkg.json
92b7e34 d9ac41d : Pin linters to narrow range to avoid noise
ee1aaf2 f11b8fc : PushPullInputAdapter - fix to previous patch that fixed out of order time handling. Need to account for the null event which signifies end of replay
fef2fac 68927fe : Update to arrow / pyarrow 16 (#210)
4717f54 086c9d5 : Add placeholder block to build action for service tests (in another PR)
306a530 ef1a239 : Merge pull request #195 from Point72/bugfix/push_pull_ooo_patch
fc239d5 4ea4799 : Maintain the type of a list-derived object when converting a struct in to_dict (#199)
adc79fd f6b0963 : Parse None natively in to_json method
3871e4a df3bb2d : Merge pull request #196 from Point72/revert-194-ac/upgrade_vcpkg_43d81795a
6c57fb3 8a0d881 : Remove all caching code from CSP (#213)
9729984 e70e4d7 : Merge pull request #174 from Point72/tkp/slacktut
964c77e 12cceeb : Merge pull request #223 from Point72/tkp/lint
801aa60 86c4e6d : Revert "Upgrade baseline in vcpkg.json"
7b07bea 64559cb : Include AS statement in SQL build query regardless of sqlalchemy version (#205)
4621584 5103026 : Re-apply lost updates in dev guides (#202)
5cde2c7 68dda2f : Merge pull request #192 from Point72/ac/parse_none_to_json
6b4f38b efe0fd6 : Add format check to lint step
4a7dc36 eaec4a0 : Update baseline to stable version
c5acdc8 3ca95b3 : Merge pull request #194 from Point72/ac/upgrade_vcpkg_43d81795a
00c2a06 471e142 : Run autofixers with pinned up packages
b748dc7 7441fb5 : Add build-debug option to Makefile so we dont forget the proper incantations (#222)
24c5818 89eda4c : fix @217 | add tests
96a47b9 118a2fb : Fix to_json serialization for floats
895563c 78e7aca : Merge pull request #211 from Point72/tkp/checklint
063b137 e2a4f2b : Fix interrupt handling issues in csp: ensure first node is stopped and reset signaled flag across runs (#206)
7197c77 da9a84f : minor bugfix to unroll cppimpl. Missing cast from vector value to ElemT, which for bool would be a vector value of unsigned char. This was triggering a CSP_ASSERT in debug builds

With the exception of the squashed one :

faee778 : Merge pull request #142 from Point72/pavithraes/docs-restructure
that is a squash of all of #142

All commits before that until 5d7eeb are unchanged

You can use the following command using this commit message to check
each of those commits vs their counterpart:

$ git show HEAD |tail -n +16 |head -n 35 | cut -f 1 -d: | xargs -L1 git diff --stat

Note that despite going Via GitHub PR this can't be solved via the PR mechanism, it will require a manual force-push from a maintainer if you want to go that route.

$ git push origin b99ee3cc6ffdc5aed7ef695c542a39299f2e1439:main --force-with-lease

Assuming b99ee3c is still the tip of the branch, and --force-with-lease to be safe. (also maybe have git push origin main:old-main once in case we ever need rollback.

All existing PRs will need rebase, and this will require to be re-worked if another PR is merged during the discussion (I can do so, but it's not super easy).

GitHub will show a diff with main, but I believe GitHub is wrong, git CLI does show an empty diff, I think Github show the diff to the common ancestor.

locally I check the content of the repo with

$ find . -type f -exec shasum {} + | grep -v git| sort | shasum 
d373eb8b7c8bc0c321e53c9a9c8d38f9cc3601af

And the has is identical on the tip of this branch and main.

pavithraes and others added 30 commits May 13, 2024 13:18
Fixes Point72#111

The structure has diverged a fair bit from the initial proposal

The Getting Started tutorials will cover a lot of csp.baselib usage details,
hence it's not a huge focus in the concepts section (→ Already tracking in a
separate issue)

The "How-to" guides only have the migrated content from old docs right now,
we'll be updating all the pages to follow a "how-to" format (→ Opened a new
issue)

The docs authoring workflow will change a little with the new GitHub sidebar,
we'll add relevant docs to make this easier

Note: This is amnual squash and rewrite of 7894f05
Signed-off-by: Pavithra Eswaramoorthy <pavithraes@outlook.com>
Signed-off-by: Arham Chopra <arham.chopra@cubistsystematic.com>
Signed-off-by: Arham Chopra <arham.chopra@cubistsystematic.com>
Signed-off-by: Arham Chopra <arham.chopra@cubistsystematic.com>
Signed-off-by: Arham Chopra <arham.chopra@cubistsystematic.com>
…time handling. Need to account for the null event which signifies end of replay

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
PushPullInputAdapter - fix to previous patch that fixed out of order …
Start organizing examples, increase test coverage of examples
…kg_43d81795a

Revert "Upgrade baseline in vcpkg.json"
Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
…n to_dict (Point72#199)

Signed-off-by: Adam Glustein <Adam.Glustein@Point72.com>
Move websocket example after merge
* Re-apply updates to build csp from source

Signed-off-by: Pavithra Eswaramoorthy <pavithraes@outlook.com>

* Add note about DCO in the Contribute.md

Signed-off-by: Pavithra Eswaramoorthy <pavithraes@outlook.com>

* Add back install notes about perl-ipc & git

* Add back Using System Dependencies section

Signed-off-by: Pavithra Eswaramoorthy <pavithraes@outlook.com>

---------

Signed-off-by: Pavithra Eswaramoorthy <pavithraes@outlook.com>
…ion (Point72#205)

Signed-off-by: Adam Glustein <Adam.Glustein@Point72.com>
* update vcpkg baseline.  forced vcpkg triplet for linux to x64-linux ( was defaulting to the community x64-linux-dynamic for some reason, which fails when building boost on the latest baseline
…d reset signaled flag across runs (Point72#206)

* Fix various interrupt handling issues in csp

Signed-off-by: Adam Glustein <Adam.Glustein@Point72.com>

* Add comment explaining signal handling in multiple engine threads

Signed-off-by: Adam Glustein <Adam.Glustein@Point72.com>

---------

Signed-off-by: Adam Glustein <Adam.Glustein@Point72.com>
Signed-off-by: Will Rieger <will.r.rieger@gmail.com>
…mT, which for bool would be a vector value of unsigned char. This was triggering a CSP_ASSERT in debug builds

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
Signed-off-by: Tim Paine <timothy.paine@cubistsystematic.com>
Fix JSONTextMessageMapper Bug in WebsocketAdapterManager
Signed-off-by: Tim Paine <timothy.paine@cubistsystematic.com>
…tations (Point72#222)

* Add build-debug option to Makefile so we dont forget the proper incantations

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
timkpaine and others added 9 commits May 13, 2024 13:19
Signed-off-by: Tim Paine <timothy.paine@cubistsystematic.com>
Signed-off-by: Adam Glustein <Adam.Glustein@Point72.com>
Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Check for python formatting changes in lint step
Pin linters to avoid noise, run auto fixers after latest changes and pinning
* resolve Point72#13 - Python 3.12 build support. 
   * python 3.12 - fix unbound local issue - changed how ts inputs to PyNode are reset to null due to new LOAD_FAST vs LOAD_FAST_CHECK opcodes in Python 3.12.  Inject DELETE opcodes into bytecode rather than setting directly to null in c++
   * cibuildwheel 2.11.2 -> 2.16.5

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
* Upgrade pyarrow to 16.0.0

Signed-off-by: Rob Ambalu <robert.ambalu@point72.com>
This is an empty commit, it is kept for information purposes.

This is a rewritten branch, that squash the content of PR Point72#142 into a
single commit (keeping a merge commit).

Due to the merkel tree nature of git, all the subsequent commits have
been rewritten, have a different hash and so it will need a force push.

For completeness here is the current list of commits on main that have
been rewritten and their new counterpart:

    old     new
    e1e1f82 7b3c3a7 : Python 3.12 build support (Point72#221)
    a32cef3 2abdf59 : Update vcpkg baseline (Point72#209)
    8bae523 c51a86b : Merge pull request Point72#189 from Point72/pavithraes/fix-links
    0964fad 7a25f45 : Merge pull request Point72#219 from Point72/wrr/fix_ws_json_mapper
    755debf cc60b87 : Merge pull request Point72#191 from Point72/ac/fix_to_json_parsing_floats
    5c7e55f ba90a02 : Merge pull request Point72#200 from Point72/tkp/docs
    2568689 abcd307 : Move websocket example after merge
    f9b7e62 da4d5e3 : fix format changes that will now result in lint failures
    687dc2e d6479c5 : Upgrade CSP to C++20; build websocket against C++17; rename .hi files (Point72#224)
    9b442d5 8adb1a7 : Upgrade baseline in vcpkg.json
    92b7e34 d9ac41d : Pin linters to narrow range to avoid noise
    ee1aaf2 f11b8fc : PushPullInputAdapter - fix to previous patch that fixed out of order time handling.  Need to account for the null event which signifies end of replay
    fef2fac 68927fe : Update to arrow / pyarrow 16 (Point72#210)
    4717f54 086c9d5 : Add placeholder block to build action for service tests (in another PR)
    306a530 ef1a239 : Merge pull request Point72#195 from Point72/bugfix/push_pull_ooo_patch
    fc239d5 4ea4799 : Maintain the type of a list-derived object when converting a struct in to_dict (Point72#199)
    adc79fd f6b0963 : Parse None natively in to_json method
    3871e4a df3bb2d : Merge pull request Point72#196 from Point72/revert-194-ac/upgrade_vcpkg_43d81795a
    6c57fb3 8a0d881 : Remove all caching code from CSP (Point72#213)
    9729984 e70e4d7 : Merge pull request Point72#174 from Point72/tkp/slacktut
    964c77e 12cceeb : Merge pull request Point72#223 from Point72/tkp/lint
    801aa60 86c4e6d : Revert "Upgrade baseline in vcpkg.json"
    7b07bea 64559cb : Include AS statement in SQL build query regardless of sqlalchemy version (Point72#205)
    4621584 5103026 : Re-apply lost updates in dev guides (Point72#202)
    5cde2c7 68dda2f : Merge pull request Point72#192 from Point72/ac/parse_none_to_json
    6b4f38b efe0fd6 : Add format check to lint step
    4a7dc36 eaec4a0 : Update baseline to stable version
    c5acdc8 3ca95b3 : Merge pull request Point72#194 from Point72/ac/upgrade_vcpkg_43d81795a
    00c2a06 471e142 : Run autofixers with pinned up packages
    b748dc7 7441fb5 : Add build-debug option to Makefile so we dont forget the proper incantations (Point72#222)
    24c5818 89eda4c : fix @217 | add tests
    96a47b9 118a2fb : Fix to_json serialization for floats
    895563c 78e7aca : Merge pull request Point72#211 from Point72/tkp/checklint
    063b137 e2a4f2b : Fix interrupt handling issues in csp: ensure first node is stopped and reset signaled flag across runs (Point72#206)
    7197c77 da9a84f : minor bugfix to unroll cppimpl.  Missing cast from vector value to ElemT, which for bool would be a vector value of unsigned char.  This was triggering a CSP_ASSERT in debug builds

With the exception of the squashed one :

    faee778 : Merge pull request Point72#142 from Point72/pavithraes/docs-restructure
                that is a squash of all of Point72#142

All commits before that until 5d7eeb are unchanged

You can use the following command using this commit message to check
each of those commits vs their counterpart:

```
$ git show HEAD |tail -n +16 |head -n 35 | cut -f 1 -d: | xargs -L1 git diff --stat
```
@Carreau
Copy link
Author

Carreau commented May 13, 2024

cc @pavithraes

This was done via a few manual git commit rebase -i,git merge -no-ff with some --author= to keep the author, pen, paper, and some magic incantation of git rebase -i --rebase-merges.

@Carreau Carreau marked this pull request as ready for review May 20, 2024 13:35
@Carreau
Copy link
Author

Carreau commented May 20, 2024

Can I get some feedback on this, I was asked for help to do this on private channels, and I want to be sure this is something that is wanted.

I'd also want to know wether it is worth for me to keep up-to date with the newly merged PR, or if I need to re-do this – which is non-trivial.

If this is something that is wanted and it has a change to make other PRs hard to merge, I can also help with rebasing the conflicting PRs.

@Carreau Carreau closed this May 31, 2024
@Point72 Point72 deleted a comment from Carreau May 31, 2024
@timkpaine timkpaine added the tag: internal Issues and PRs for maintainance of the project - not interesting to external users label Jun 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tag: internal Issues and PRs for maintainance of the project - not interesting to external users
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants