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

[WIP] New persistence model #4527

Closed
wants to merge 159 commits into from
Closed

[WIP] New persistence model #4527

Changes from 1 commit
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
cb9f0f0
Initial tests
freimair Apr 9, 2020
3296db3
Version helper uses real Bisq version
freimair Apr 15, 2020
e7831d6
Tests use static fixtures
freimair Apr 16, 2020
581286e
Migration test succeeds
freimair Apr 16, 2020
fc7a43d
GetMap test succeeds
freimair Apr 16, 2020
d111d8c
GetMapSinceFilter works
freimair Apr 16, 2020
6eda9a9
updateScenario works
freimair Apr 16, 2020
ff53f51
freshInstall scenario works
freimair Apr 16, 2020
49731f9
put scenario works
freimair Apr 16, 2020
e123a0b
Introduce SplitStore and Service to handle BL
freimair Apr 17, 2020
da5d41b
Moved file handling logic to SplitStoreService
freimair Apr 17, 2020
c7351a0
Activate other split data stores
freimair Apr 17, 2020
e2e80d7
Refactored tests
freimair Apr 20, 2020
10c1ecc
Initial tests for requests
freimair Apr 20, 2020
f6cea15
Requests are smaller
freimair Apr 20, 2020
0d80123
Prevent adding duplicate data
freimair Apr 24, 2020
aad57c3
Enforce version format and filter faulty ones
freimair Apr 24, 2020
faca8e4
Test incoming special keys from the future
freimair Apr 24, 2020
72600b1
Javadoc cosmetics
freimair Apr 24, 2020
3ad395b
Init integration test script
freimair Apr 29, 2020
2589137
Persist live database after split
freimair May 1, 2020
34abad0
Integration test script tests stock
freimair May 1, 2020
62a77e3
Use version history array
freimair May 1, 2020
39fcca5
Integration test script tests new system
freimair May 4, 2020
a3628ff
Use full sync between seednodes
freimair May 4, 2020
a374249
Cleanup integration test script
freimair May 4, 2020
8e55f64
Ignore some tests
freimair May 11, 2020
e927e6d
Adjust P2PDataStorage tests
freimair May 11, 2020
2fb2232
Add another migration test
freimair May 12, 2020
5f8b7cf
Reactivate ignored tests
freimair May 12, 2020
f8320fe
Refactoring and cleaning up
freimair May 20, 2020
017bbfd
Cleanup
freimair May 20, 2020
d2a6655
Refactored test helpers
freimair May 21, 2020
469c374
Fixed a potential issue when loading stores
freimair May 21, 2020
249e185
Fixed wrong filename
freimair May 22, 2020
06ec223
Refactoring
freimair May 22, 2020
eabadc0
Make special key platform-independent
freimair May 26, 2020
755fc03
Fixed persisting wrong data store
freimair Jun 12, 2020
d218f2e
Renamed data stores
freimair Jun 12, 2020
c34bfee
Replace TODO comment
freimair Jun 16, 2020
d6f195d
Fixed a timing issue
freimair Jul 1, 2020
d81bdab
Added 1.3.6 and 1.3.7 data stores
freimair Sep 1, 2020
abbfedc
Update history version list
freimair Sep 1, 2020
5f94406
Removed deprecated test mechanisms
freimair Sep 1, 2020
0eccec7
Cleanup imports
freimair Sep 1, 2020
270f1e7
Included PR feedback
freimair Sep 1, 2020
c8c63ef
Included PR feedback
freimair Sep 1, 2020
76cc37e
Added 1.3.8 data stores
freimair Sep 12, 2020
b4aae51
Use Version.VERSION again
freimair Sep 12, 2020
f83c147
Merge branch 'master_upstream' into chimp-reduce_initial_request_size
chimp1984 Sep 13, 2020
5f8e779
Refactor: Add getStore method to be reused by SplitStoreService
chimp1984 Sep 13, 2020
3100888
Use readStore(); instead of store = readStore(getFileName());
chimp1984 Sep 13, 2020
591c2fb
Apply code inspection suggestions
chimp1984 Sep 13, 2020
d5c6644
Add mapOfHistoricalStores field
chimp1984 Sep 13, 2020
3dac4c4
Revert critical data stores to current version.
chimp1984 Sep 13, 2020
2cef411
Add version field
chimp1984 Sep 13, 2020
8458a88
Remove methods in MapStoreService and do instead instance of check in…
chimp1984 Sep 13, 2020
2ece512
Add current version to version list. Makes it more clear that those a…
chimp1984 Sep 13, 2020
965de7f
Remove file
chimp1984 Sep 13, 2020
cfefae2
Rename SplitStore to PersistableNetworkPayload
chimp1984 Sep 13, 2020
28987f5
Rename for better clarity
chimp1984 Sep 13, 2020
6cf054c
Fix bug with missing replace -> use existing methods in Version for v…
chimp1984 Sep 13, 2020
aadd2e4
Revert version to 1.3.7 to not break build
chimp1984 Sep 13, 2020
7a5ba0b
Fix param in test. Add Ignore to the 2 test classes handling the new …
chimp1984 Sep 13, 2020
224eaab
Fix param in test.
chimp1984 Sep 13, 2020
98877b4
Revert changes at tests from prev version
chimp1984 Sep 13, 2020
bef99d6
Move read code from file manager to storage
chimp1984 Sep 14, 2020
22e54dc
Remove FileManager class
chimp1984 Sep 14, 2020
977ea67
Replace init methods with getPersisted
chimp1984 Sep 14, 2020
42a068e
Change API for Storage
chimp1984 Sep 15, 2020
8870ffb
Use Userthread executor instead of new thread (WIP)
chimp1984 Sep 15, 2020
ecdd5c0
Flush to disk at shutdown
chimp1984 Sep 15, 2020
5ef3b34
Refactor: Rename class
chimp1984 Sep 15, 2020
bb0d1ee
Refactor: Rename package
chimp1984 Sep 15, 2020
fafc8b9
Refactor: Rename queueUpForSave to persistAtShutDown
chimp1984 Sep 15, 2020
15464e0
Add Priority enum
chimp1984 Sep 15, 2020
15d6c11
Remove removeAndBackupFile call
chimp1984 Sep 15, 2020
3ce70e3
Change PersistenceManager.Priority
chimp1984 Sep 15, 2020
9090fb7
Refactor: Rename method and variable
chimp1984 Sep 15, 2020
e77a963
Add timer to write to disk if data has high prio
chimp1984 Sep 15, 2020
e84c850
Change log level
chimp1984 Sep 15, 2020
cf2255a
Cleanups
chimp1984 Sep 15, 2020
e73d900
Remove unused var
chimp1984 Sep 15, 2020
24e9041
Fix bugs in TradableList
chimp1984 Sep 15, 2020
0f5ebb2
Disable tests with sequence number map. Need to be fixed but not triv…
chimp1984 Sep 15, 2020
0273acd
Add delay to all files
chimp1984 Sep 15, 2020
9b8a49d
Call persist only if a setter got invoked
chimp1984 Sep 15, 2020
32cf32c
Merge branch 'master_upstream' into chimp-reduce_initial_request_size
chimp1984 Sep 15, 2020
8f2e4ca
Change dev mode price
chimp1984 Sep 15, 2020
22fc97d
Remove test files from previous version
chimp1984 Sep 16, 2020
9c873a6
Add getPersisted method
chimp1984 Sep 16, 2020
3252a50
remove test files
chimp1984 Sep 16, 2020
a3ea54a
remove test
chimp1984 Sep 16, 2020
2b61563
Fix issues and refactor
chimp1984 Sep 16, 2020
996364e
Cleanup
chimp1984 Sep 16, 2020
4115c0c
Add data from non-splitStoreService as well
chimp1984 Sep 16, 2020
ad95019
Merge branch 'master_upstream' into chimp-reduce_initial_request_size
chimp1984 Sep 17, 2020
f2c78bc
Merge branch 'master_upstream' into new-persistence-model
chimp1984 Sep 17, 2020
610f284
Refactor: Rename method
chimp1984 Sep 17, 2020
de6fac0
Fix wrong field used in log
chimp1984 Sep 17, 2020
e40c277
Add getSingleThreadExecutor
chimp1984 Sep 17, 2020
3c2060a
Refactor: Rename thread name
chimp1984 Sep 17, 2020
36e18d4
Refactor: Use existing method for persist
chimp1984 Sep 17, 2020
5cb2763
Remove shutDownHook
chimp1984 Sep 17, 2020
09abac7
Remove awaitTermination
chimp1984 Sep 17, 2020
056adc0
Refactor: Change logs
chimp1984 Sep 17, 2020
3524c6c
Split write operation between serialisation and write to disk task.
chimp1984 Sep 17, 2020
21c29ae
Merge branch 'master_upstream' into new-persistence-model
chimp1984 Sep 19, 2020
e680c4d
Merge branch 'master_upstream' into chimp-reduce_initial_request_size
chimp1984 Sep 19, 2020
80bf8bf
Merge branch 'master_upstream' into chimp-reduce_initial_request_size
chimp1984 Sep 27, 2020
3a4784e
Merge branch 'chimp-reduce_initial_request_size' of https://github.co…
chimp1984 Sep 27, 2020
c482a1b
Cleanups, renaming, add comments
chimp1984 Sep 27, 2020
ba0dc1b
Fix mock class to reflect real class better.
chimp1984 Sep 28, 2020
f132a35
Fix incorrect test.
chimp1984 Sep 28, 2020
6eb1efb
Remove todo, add system line break
chimp1984 Sep 28, 2020
ee725bc
Add more logs
chimp1984 Sep 28, 2020
82c5b5e
Add isEmpty check
chimp1984 Sep 29, 2020
171be24
Do not call super.readFromResources(postFix); as we do not have a no…
chimp1984 Sep 29, 2020
bd38097
Add more logs
chimp1984 Sep 29, 2020
0feece6
Remove toProtoNetworkEnvelope call used only for debug logs
chimp1984 Sep 29, 2020
e402c8a
Only call pruneStore if we have created a new historical store from r…
chimp1984 Sep 29, 2020
620dfca
Fix wrong param order in log
chimp1984 Sep 29, 2020
90da37f
Remove dev test data
chimp1984 Sep 29, 2020
9240eec
Add more info in log
chimp1984 Sep 29, 2020
ab82286
Rename SplitStoreService to HistoricalDataStoreService
chimp1984 Sep 29, 2020
b1cf73e
Merge branch 'master_upstream' into new-persistence-model
chimp1984 Sep 29, 2020
9e7180d
Fix merge issues
chimp1984 Sep 29, 2020
6fe0e9c
Merge branch 'master_upstream' into new-persistence-model
chimp1984 Sep 29, 2020
e71138c
Fix merge issues
chimp1984 Sep 29, 2020
3e269f5
Merge branch 'new-persistence-model' of https://github.com/chimp1984/…
chimp1984 Sep 29, 2020
221496e
Apply codacy suggestions (this time they make sense)
chimp1984 Sep 29, 2020
b8ef517
Make method private
chimp1984 Sep 29, 2020
5afdf12
Fixed Tests
chimp1984 Sep 29, 2020
78ee6b8
Mkae fields final, use setters
chimp1984 Sep 30, 2020
31126e7
Cleanups, small refactorings,...
chimp1984 Sep 30, 2020
a129c15
Use persistNow for daostate snapshot
chimp1984 Sep 30, 2020
cbbec44
Rename persist to requestPersistence
chimp1984 Sep 30, 2020
f3089b3
Refactor: Rename persist to requestPersistence
chimp1984 Sep 30, 2020
a31dac5
Add generics
chimp1984 Sep 30, 2020
017d4bf
Call requestPersistence at trade manager as we do not do it in trade …
chimp1984 Sep 30, 2020
1e41936
Remove persist method from Model interface and its implementations.
chimp1984 Sep 30, 2020
ec3b361
Remove persist method in trade and call it from outside callers on Tr…
chimp1984 Sep 30, 2020
0b615cc
Refactor: move classes to new package
chimp1984 Sep 30, 2020
9b948de
Apply generics
chimp1984 Sep 30, 2020
5142d28
Make method public
chimp1984 Sep 30, 2020
421a81c
Apply generics
chimp1984 Sep 30, 2020
cfa5840
Refactor: Rename CorruptedDatabaseFilesHandler to CorruptedStorageFil…
chimp1984 Sep 30, 2020
01a8fd6
Use method without additionalHosts
chimp1984 Sep 30, 2020
4be2758
Add and apply PersistableNetworkPayloadStore
chimp1984 Oct 1, 2020
335f82e
Apply generics
chimp1984 Oct 1, 2020
1b453de
Refactor: Use AtomicReference instead of array
chimp1984 Oct 1, 2020
cb6a5ab
Refactor: Move dao storage classes to storage package
chimp1984 Oct 1, 2020
476bc81
Remove empty loop (was from old debugging
chimp1984 Oct 1, 2020
656896d
Do not try to read from resources as we know that there is none. Inst…
chimp1984 Oct 1, 2020
7601da2
Merge branch 'master_upstream' into new-persistence-model-merged
chimp1984 Oct 1, 2020
3707ad2
Merged master
chimp1984 Oct 1, 2020
2ab7c03
Merged initial data request branch
chimp1984 Oct 1, 2020
616a4b6
Merge remote-tracking branch 'origin/new-persistence-model' into new-…
chimp1984 Oct 1, 2020
6987567
Fix merge issues
chimp1984 Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
View file
Open in desktop
Expand Up @@ -619,7 +619,7 @@ private void doOpenDispute(boolean isSupportTicket, Transaction depositTx) {
PubKeyRing refundAgentPubKeyRing = trade.getRefundAgentPubKeyRing();
checkNotNull(refundAgentPubKeyRing, "refundAgentPubKeyRing must not be null");
byte[] depositTxSerialized = depositTx.bitcoinSerialize();
String depositTxHashAsString = depositTx.getHashAsString();
String depositTxHashAsString = depositTx.getTxId().toString();
Dispute dispute = new Dispute(new Date().getTime(),
trade.getId(),
pubKeyRing.hashCode(), // traderId
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.