Renamed TxName to FateOp #5273
Renamed TxName to FateOp #5273
Conversation
core/src/main/java/org/apache/accumulo/core/fate/AdminUtil.java
Outdated
Show resolved
Hide resolved
| @@ -44,7 +44,7 @@ public static class TxInfoColumnFamily { | |||
| public static final String STR_NAME = "txinfo"; | |||
| public static final Text NAME = new Text(STR_NAME); | |||
|
|
|||
| public static final String TX_NAME = "txname"; | |||
| public static final String TX_NAME = "FateOp"; | |||
There was a problem hiding this comment.
| public static final String TX_NAME = "FateOp"; | |
| public static final String FATE_OP = "fateop"; |
Would be nice to change TX_NAME here to FATE_OP and maintain lowercase string value for consistency
There was a problem hiding this comment.
this still needs to be resolved
| @@ -44,7 +44,7 @@ public static class TxInfoColumnFamily { | |||
| public static final String STR_NAME = "txinfo"; | |||
| public static final Text NAME = new Text(STR_NAME); | |||
|
|
|||
| public static final String TX_NAME = "txname"; | |||
| public static final String TX_NAME = "FateOp"; | |||
| public static final ColumnFQ TX_NAME_COLUMN = new ColumnFQ(NAME, new Text(TX_NAME)); | |||
There was a problem hiding this comment.
This would also need to be changed to no longer reference TX_NAME
| @@ -223,7 +223,7 @@ private void seedTransaction(Fate.FateOperation txName, Repo<T> repo, boolean au | |||
| if (autoCleanUp) { | |||
| txStore.setTransactionInfo(TxInfo.AUTO_CLEAN, autoCleanUp); | |||
| } | |||
| txStore.setTransactionInfo(TxInfo.TX_NAME, txName); | |||
| txStore.setTransactionInfo(TxInfo.TX_NAME, FateOp); | |||
There was a problem hiding this comment.
The TxInfo enum value TX_NAME should also be changed to FATE_OP
|
@kevinrr888 PTAL :) |
| public static final String TX_NAME = "txname"; | ||
| public static final ColumnFQ TX_NAME_COLUMN = new ColumnFQ(NAME, new Text(TX_NAME)); | ||
| public static final String FATE_OP = "fateOp"; | ||
| public static final ColumnFQ TX_NAME_COLUMN = new ColumnFQ(NAME, new Text(FATE_OP)); |
There was a problem hiding this comment.
this still needs to be changed
| public static final ColumnFQ TX_NAME_COLUMN = new ColumnFQ(NAME, new Text(FATE_OP)); | |
| public static final ColumnFQ FATE_OP_COLUMN = new ColumnFQ(NAME, new Text(FATE_OP)); |
| @@ -223,7 +223,7 @@ private void seedTransaction(Fate.FateOperation txName, Repo<T> repo, boolean au | |||
| if (autoCleanUp) { | |||
| txStore.setTransactionInfo(TxInfo.AUTO_CLEAN, autoCleanUp); | |||
| } | |||
| txStore.setTransactionInfo(TxInfo.TX_NAME, txName); | |||
| txStore.setTransactionInfo(TxInfo.TX_NAME, fateOp); | |||
There was a problem hiding this comment.
ensure that TxInfo.TX_NAME is no longer referenced as it no longer exists. This, any maybe elsewhere, needs to be changed to
TxInfo.FATE_OP
| if (txnStatus.getTxName() != null) { | ||
| txName = txnStatus.getTxName().name(); | ||
| if (txnStatus.getfateOp() != null) { | ||
| fateOp= txnStatus.getfateOp().name(); |
There was a problem hiding this comment.
Run the maven command:
mvn clean package -DskipTests
to quickly format the project
| @@ -103,8 +103,8 @@ public long getRunning() { | |||
| return running; | |||
| } | |||
|
|
|||
| public String getTxName() { | |||
| return txName; | |||
| public String getfateOp() { | |||
There was a problem hiding this comment.
| public String getfateOp() { | |
| public String getFateOp() { |
|
@kevinrr888 PTAL... |
|
This PR has build failures: https://github.com/apache/accumulo/actions/runs/12890793516/job/35955491442?pr=5273 |
|
@kevinrr888 mvn clean package -DskipTests , when running this command its showing error |
|
If the project is in a state where it cannot compile, which it currently is in this PR, then the command won't work. Ensure all variables and methods changed are also changed everywhere they are referenced. |
|
|
|
Closing due to inactivity and several unaddressed issues and comments |
Tried to solve issue #5230 .... Renamed TxName to FateOp.