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

Update expensify_prod branch #1884

Merged
merged 26 commits into from
Oct 1, 2024
Merged

Update expensify_prod branch #1884

merged 26 commits into from
Oct 1, 2024

Conversation

MariaHCD
Copy link
Contributor

@MariaHCD MariaHCD commented Oct 1, 2024

Will self-merge, this code has already been peer reviewed.

flodnv and others added 26 commits September 19, 2024 17:48
@flodnv
Log which peers are logged in
36d8cbf
@tylerkaraszewski
Notes
f46df8e
@tylerkaraszewski
Move standup response to separate function
1b4028f
@tylerkaraszewski
Don't send separate state message
0a63e7e
@tylerkaraszewski
Cleanup
28ce2a3
@flodnv
Use SComposeList
2ac10ba
@danieldoglas
adding new properties
33a90a3
@danieldoglas
adding new properties
c94484a
@danieldoglas
adding new functions
7eeddaf
@tylerkaraszewski
Merge pull request #1881 from Expensify/flo_logpeers
926c960 
Log which peers are logged in
@danieldoglas
checking for commit table before locking
0d84e65
@danieldoglas
removing vscode settings folder from commitable files
56abe2b
@danieldoglas
removing vs code folder
ec7a49d
@danieldoglas
capturing table name from log
676f804
@danieldoglas
reseting _conflictTable and fixing logs
5c99651
@danieldoglas
adding comment
48f8345
@danieldoglas
clarifying comment
1a306b2
@danieldoglas
addressing comments
786e21b
@danieldoglas
adding check if offset exists
9d35fc0
@danieldoglas
adding comment
27642d6
@danieldoglas
style change
9fcee06
@danieldoglas
adding enableConflictPageLocks on cluster test
202c584
@tylerkaraszewski
Merge pull request #1877 from Expensify/tyler-fix-connect-while-stand…
1ef3e2d 
…ing-up

Respond to standup at login correctly.
@flodnv
Merge pull request #1882 from Expensify/dsilva_removingConflictsCheck…
294538c 
…sOnJournals

Removing conflict check when the last conflict happened on a journal
@flodnv
Don't operate on null pointer
c956666
@flodnv
Merge pull request #1883 from Expensify/flo_nulloffset
599ae10 
Don't operate on null pointer
@melvin-bot Melvin Bot
Copy link

melvin-bot bot commented Oct 1, 2024

I see this code uses list. If your primary use case is just checking to see if an item exists in the list, perhaps set is a better choice, as it's much faster for random access. C++ has a variety of data structures available to choose from, so pick the best for your use case.

@MariaHCD MariaHCD merged commit ea39411 into expensify_prod Oct 1, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MariaHCD @flodnv @tylerkaraszewski @danieldoglas