This repository was archived by the owner on Aug 23, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 370
Transaction pinning: #1599 #1632
Draft
ovanwijk
wants to merge
31
commits into
iotaledger:dev
Choose a base branch
from
ovanwijk:SPstorage
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 18 commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
0b8a6bd
Counted transaction model for selective permanode storage capabilitie…
ovanwijk 27fa821
- Removed counted transaction model
ovanwijk d690463
- Added a separate permanent storage provider for permanent storage
ovanwijk 18d6ced
Merge branch 'dev' into SPstorage
ovanwijk c28bbaa
Removed the countered transaction model, just pinning, unpinning and …
ovanwijk e27f1e7
Renaming and comments
ovanwijk 30d827b
Merge branch 'dev' into SPstorage
ovanwijk c989470
Fix for RocksDBPPPImpl to handle integer indexes.
ovanwijk be9fd59
Name changes and comments
ovanwijk 5d5d463
Added boolean return values for transactionPinning
ovanwijk fe988f7
Revert test code to original code
ovanwijk 4b21d42
Space removal
ovanwijk 322764a
Braces fix
ovanwijk 300ec78
Style updates and comments
ovanwijk 1416ada
Style updates
ovanwijk 68680f8
Import hell, why is this better then .* ?
ovanwijk 74f86e7
Constructor comment and boolean response comment
ovanwijk 2a8330d
Merge branch 'dev' into SPstorage
ovanwijk 0c96323
Update src/main/java/com/iota/iri/storage/rocksDB/RocksDBPPPImpl.java
ovanwijk 734fa04
Update src/main/java/com/iota/iri/storage/rocksDB/RocksDBPPPImpl.java
ovanwijk 5d467d9
Update src/main/java/com/iota/iri/service/API.java
ovanwijk 9dee4cd
Update src/main/java/com/iota/iri/service/API.java
ovanwijk e6288e9
Update src/main/java/com/iota/iri/service/API.java
ovanwijk 06d35b8
Update src/main/java/com/iota/iri/storage/rocksDB/RocksDBPPPImpl.java
ovanwijk bf0fb20
Update src/main/java/com/iota/iri/storage/rocksDB/RocksDBPPPImpl.java
ovanwijk 7faad38
Update src/main/java/com/iota/iri/service/API.java
ovanwijk 3363209
Merge branch 'dev' into SPstorage
ovanwijk 5abc785
Commit and merge
ovanwijk e5a8f16
Null fix and mayExist fix
ovanwijk 97d5ec0
Fix API check
ovanwijk 920e60b
Merge branch 'dev' into SPstorage
ovanwijk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
package com.iota.iri.conf; | ||
|
||
/** | ||
* Configurations for tangle database. | ||
*/ | ||
public interface PermaDBConfig extends Config { | ||
|
||
|
||
/** | ||
* Default Value: {@value BaseIotaConfig.Defaults#PERMADB_ENABLED} | ||
* | ||
* @return {@value PermaDBConfig.Descriptions#PERMADB_ENABLED} | ||
*/ | ||
boolean isSelectivePermaEnabled(); | ||
|
||
/** | ||
* Default Value: {@value BaseIotaConfig.Defaults#PERMADB_PATH} | ||
* | ||
* @return {@value PermaDBConfig.Descriptions#PERMADB_PATH} | ||
*/ | ||
String getPermaDbPath(); | ||
|
||
/** | ||
* Default Value: {@value BaseIotaConfig.Defaults#PERMADB_LOG_PATH} | ||
* | ||
* @return {@value PermaDBConfig.Descriptions#PERMADB_LOG_PATH} | ||
*/ | ||
String getPermaDbLogPath(); | ||
|
||
/** | ||
* Default Value: {@value BaseIotaConfig.Defaults#PERMADB_CACHE_SIZE} | ||
* | ||
* @return {@value PermaDBConfig.Descriptions#PERMADB_CACHE_SIZE} | ||
*/ | ||
int getPermaDbCacheSize(); | ||
|
||
/** | ||
* Default Value: {@value BaseIotaConfig.Defaults#PERMAMAIN_DB} | ||
* | ||
* @return {@value PermaDBConfig.Descriptions#PERMAMAIN_DB} | ||
*/ | ||
String getPermaMainDb(); | ||
|
||
/** | ||
* Default Value: {@value BaseIotaConfig.Defaults#PERMAREVALIDATE} | ||
* | ||
* @return {@value PermaDBConfig.Descriptions#PERMAREVALIDATE} | ||
*/ | ||
boolean permaIsRevalidate(); | ||
|
||
/** | ||
* Default Value: {@value BaseIotaConfig.Defaults#PERMARESCAN_DB} | ||
* | ||
* @return {@value PermaDBConfig.Descriptions#PERMARESCAN_DB} | ||
*/ | ||
boolean permaIsRescanDb(); | ||
|
||
/** | ||
* Field descriptions | ||
*/ | ||
interface Descriptions { | ||
|
||
String PERMADB_PATH = "The folder where the DB saves its data."; | ||
String PERMADB_LOG_PATH = "The folder where the DB logs info"; | ||
String PERMADB_CACHE_SIZE = "The size of the DB cache in KB"; | ||
String PERMAMAIN_DB = "The DB engine used to store the transactions. Currently only RocksDB is supported."; | ||
String PERMAREVALIDATE = "Reload from the db data about confirmed transaction (milestones), state of the ledger, " + | ||
"and transaction metadata."; | ||
String PERMARESCAN_DB = "Rescan all transaction metadata (Approvees, Bundles, and Tags)"; | ||
String PERMADB_ENABLED = "Enables secondary permanent storage"; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -62,7 +62,6 @@ public void readMetadata(byte[] bytes) { | |
|
||
} | ||
|
||
|
||
@Override | ||
public boolean canMerge() { | ||
return true; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -55,7 +55,6 @@ public void readMetadata(byte[] bytes) { | |
|
||
} | ||
|
||
|
||
@Override | ||
public boolean canMerge() { | ||
return false; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer to use
UnsupportedOperationException
, just because it doesn't have a dependency on a 3rd party library