Skip to content

Commit ac634ad

Browse files
shishkoviljashishkovilja
committed
IGNITE-25995 Remove message interface from TxEntryValueHolder and IgniteTxEntry
1 parent cfd70ba commit ac634ad

3 files changed

Lines changed: 2 additions & 344 deletions

File tree

‎modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,7 @@
152152
import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery;
153153
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryBatchAck;
154154
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEntry;
155-
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
156155
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
157-
import org.apache.ignite.internal.processors.cache.transactions.TxEntryValueHolder;
158156
import org.apache.ignite.internal.processors.cache.transactions.TxLock;
159157
import org.apache.ignite.internal.processors.cache.transactions.TxLockList;
160158
import org.apache.ignite.internal.processors.cache.transactions.TxLocksRequest;
@@ -309,8 +307,6 @@ public class GridIoMessageFactory implements MessageFactoryProvider {
309307
factory.register((short)97, CacheEvictionEntry::new, new CacheEvictionEntrySerializer());
310308
factory.register((short)98, CacheEntryPredicateContainsValue::new);
311309
factory.register((short)99, CacheEntrySerializablePredicate::new);
312-
factory.register((short)100, IgniteTxEntry::new);
313-
factory.register((short)101, TxEntryValueHolder::new);
314310
factory.register((short)102, CacheVersionedValue::new, new CacheVersionedValueSerializer());
315311
factory.register((short)103, GridCacheRawVersionedEntry::new);
316312
factory.register((short)104, GridCacheVersionEx::new, new GridCacheVersionExSerializer());

‎modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java‎

Lines changed: 1 addition & 248 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.apache.ignite.internal.processors.cache.transactions;
1919

20-
import java.nio.ByteBuffer;
2120
import java.util.Collection;
2221
import java.util.LinkedList;
2322
import java.util.UUID;
@@ -26,8 +25,6 @@
2625
import javax.cache.processor.EntryProcessor;
2726
import org.apache.ignite.IgniteCache;
2827
import org.apache.ignite.IgniteCheckedException;
29-
import org.apache.ignite.internal.GridDirectTransient;
30-
import org.apache.ignite.internal.IgniteCodeGeneratingFail;
3128
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
3229
import org.apache.ignite.internal.processors.cache.CacheEntryPredicate;
3330
import org.apache.ignite.internal.processors.cache.CacheInvalidStateException;
@@ -47,14 +44,9 @@
4744
import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
4845
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
4946
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
50-
import org.apache.ignite.internal.util.typedef.F;
5147
import org.apache.ignite.internal.util.typedef.T2;
5248
import org.apache.ignite.internal.util.typedef.internal.CU;
5349
import org.apache.ignite.internal.util.typedef.internal.U;
54-
import org.apache.ignite.plugin.extensions.communication.Message;
55-
import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
56-
import org.apache.ignite.plugin.extensions.communication.MessageReader;
57-
import org.apache.ignite.plugin.extensions.communication.MessageWriter;
5850
import org.apache.ignite.thread.IgniteThread;
5951
import org.jetbrains.annotations.Nullable;
6052

@@ -66,8 +58,7 @@
6658
* {@link #equals(Object)} method, as transaction entries should use referential
6759
* equality.
6860
*/
69-
@IgniteCodeGeneratingFail // Field filters should not be generated by MessageCodeGenerator.
70-
public class IgniteTxEntry implements GridPeerDeployAware, Message {
61+
public class IgniteTxEntry implements GridPeerDeployAware {
7162
/** */
7263
private static final long serialVersionUID = 0L;
7364

@@ -104,7 +95,6 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
10495

10596
/** Owning transaction. */
10697
@GridToStringExclude
107-
@GridDirectTransient
10898
public IgniteInternalTx tx;
10999

110100
/** Cache key. */
@@ -116,7 +106,6 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
116106
private int cacheId;
117107

118108
/** Transient tx key. */
119-
@GridDirectTransient
120109
private IgniteTxKey txKey;
121110

122111
/** Cache value. */
@@ -125,7 +114,6 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
125114

126115
/** Visible value for peek. */
127116
@GridToStringInclude
128-
@GridDirectTransient
129117
private TxEntryValueHolder prevVal = new TxEntryValueHolder();
130118

131119
/** Old value before update. */
@@ -134,11 +122,9 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
134122

135123
/** Transform. */
136124
@GridToStringInclude
137-
@GridDirectTransient
138125
private Collection<T2<EntryProcessor<Object, Object, Object>, Object[]>> entryProcessorsCol;
139126

140127
/** Transient field for calculated entry processor value. */
141-
@GridDirectTransient
142128
private T2<GridCacheOperation, CacheObject> entryProcessorCalcVal;
143129

144130
/** Transform closure bytes. */
@@ -159,51 +145,40 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
159145
private GridCacheVersion explicitVer;
160146

161147
/** DHT version. */
162-
@GridDirectTransient
163148
private volatile GridCacheVersion dhtVer;
164149

165150
/** Put filters. */
166151
@GridToStringInclude
167152
private CacheEntryPredicate[] filters;
168153

169154
/** Flag indicating whether filters passed. Used for fast-commit transactions. */
170-
@GridDirectTransient
171155
private boolean filtersPassed;
172156

173157
/** Flag indicating that filter is set and can not be replaced. */
174-
@GridDirectTransient
175158
private boolean filtersSet;
176159

177160
/** Underlying cache entry. */
178-
@GridDirectTransient
179161
private volatile GridCacheEntryEx entry;
180162

181163
/** Cache registry. */
182-
@GridDirectTransient
183164
private GridCacheContext<?, ?> ctx;
184165

185166
/** Prepared flag to prevent multiple candidate add. */
186-
@GridDirectTransient
187167
private transient volatile int prepared;
188168

189169
/** Lock flag for collocated cache. */
190-
@GridDirectTransient
191170
private transient boolean locked;
192171

193172
/** Assigned node ID (required only for partitioned cache). */
194-
@GridDirectTransient
195173
private UUID nodeId;
196174

197175
/** Flag if this node is a back up node. */
198-
@GridDirectTransient
199176
private boolean locMapped;
200177

201178
/** Expiry policy. */
202-
@GridDirectTransient
203179
private ExpiryPolicy expiryPlc;
204180

205181
/** Expiry policy transfer flag. */
206-
@GridDirectTransient
207182
private boolean transferExpiryPlc;
208183

209184
/** Expiry policy bytes. */
@@ -213,14 +188,12 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
213188
private byte flags;
214189

215190
/** Partition update counter. */
216-
@GridDirectTransient
217191
private long partUpdateCntr;
218192

219193
/** */
220194
private GridCacheVersion serReadVer;
221195

222196
/** */
223-
@GridDirectTransient
224197
@GridToStringExclude
225198
private transient @Nullable GridAbsClosureX cqNotifyC;
226199

@@ -1084,226 +1057,6 @@ public void clearEntryReadVersion() {
10841057
serReadVer = null;
10851058
}
10861059

1087-
/** {@inheritDoc} */
1088-
@Override public void onAckReceived() {
1089-
// No-op.
1090-
}
1091-
1092-
/** {@inheritDoc} */
1093-
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
1094-
writer.setBuffer(buf);
1095-
1096-
if (!writer.isHeaderWritten()) {
1097-
if (!writer.writeHeader(directType()))
1098-
return false;
1099-
1100-
writer.onHeaderWritten();
1101-
}
1102-
1103-
switch (writer.state()) {
1104-
case 0:
1105-
if (!writer.writeInt(cacheId))
1106-
return false;
1107-
1108-
writer.incrementState();
1109-
1110-
case 1:
1111-
if (!writer.writeLong(conflictExpireTime))
1112-
return false;
1113-
1114-
writer.incrementState();
1115-
1116-
case 2:
1117-
if (!writer.writeMessage(conflictVer))
1118-
return false;
1119-
1120-
writer.incrementState();
1121-
1122-
case 3:
1123-
if (!writer.writeByteArray(expiryPlcBytes))
1124-
return false;
1125-
1126-
writer.incrementState();
1127-
1128-
case 4:
1129-
if (!writer.writeMessage(explicitVer))
1130-
return false;
1131-
1132-
writer.incrementState();
1133-
1134-
case 5:
1135-
if (!writer.writeObjectArray(
1136-
!F.isEmptyOrNulls(filters) ? filters : null, MessageCollectionItemType.MSG))
1137-
return false;
1138-
1139-
writer.incrementState();
1140-
1141-
case 6:
1142-
if (!writer.writeByte(flags))
1143-
return false;
1144-
1145-
writer.incrementState();
1146-
1147-
case 7:
1148-
if (!writer.writeKeyCacheObject(key))
1149-
return false;
1150-
1151-
writer.incrementState();
1152-
1153-
case 8:
1154-
if (!writer.writeMessage(oldVal))
1155-
return false;
1156-
1157-
writer.incrementState();
1158-
1159-
case 9:
1160-
if (!writer.writeMessage(serReadVer))
1161-
return false;
1162-
1163-
writer.incrementState();
1164-
1165-
case 10:
1166-
if (!writer.writeByteArray(transformClosBytes))
1167-
return false;
1168-
1169-
writer.incrementState();
1170-
1171-
case 11:
1172-
if (!writer.writeLong(ttl))
1173-
return false;
1174-
1175-
writer.incrementState();
1176-
1177-
case 12:
1178-
if (!writer.writeMessage(val))
1179-
return false;
1180-
1181-
writer.incrementState();
1182-
1183-
}
1184-
1185-
return true;
1186-
}
1187-
1188-
/** {@inheritDoc} */
1189-
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
1190-
reader.setBuffer(buf);
1191-
1192-
switch (reader.state()) {
1193-
case 0:
1194-
cacheId = reader.readInt();
1195-
1196-
if (!reader.isLastRead())
1197-
return false;
1198-
1199-
reader.incrementState();
1200-
1201-
case 1:
1202-
conflictExpireTime = reader.readLong();
1203-
1204-
if (!reader.isLastRead())
1205-
return false;
1206-
1207-
reader.incrementState();
1208-
1209-
case 2:
1210-
conflictVer = reader.readMessage();
1211-
1212-
if (!reader.isLastRead())
1213-
return false;
1214-
1215-
reader.incrementState();
1216-
1217-
case 3:
1218-
expiryPlcBytes = reader.readByteArray();
1219-
1220-
if (!reader.isLastRead())
1221-
return false;
1222-
1223-
reader.incrementState();
1224-
1225-
case 4:
1226-
explicitVer = reader.readMessage();
1227-
1228-
if (!reader.isLastRead())
1229-
return false;
1230-
1231-
reader.incrementState();
1232-
1233-
case 5:
1234-
filters = reader.readObjectArray(MessageCollectionItemType.MSG, CacheEntryPredicate.class);
1235-
1236-
if (!reader.isLastRead())
1237-
return false;
1238-
1239-
reader.incrementState();
1240-
1241-
case 6:
1242-
flags = reader.readByte();
1243-
1244-
if (!reader.isLastRead())
1245-
return false;
1246-
1247-
reader.incrementState();
1248-
1249-
case 7:
1250-
key = reader.readKeyCacheObject();
1251-
1252-
if (!reader.isLastRead())
1253-
return false;
1254-
1255-
reader.incrementState();
1256-
1257-
case 8:
1258-
oldVal = reader.readMessage();
1259-
1260-
if (!reader.isLastRead())
1261-
return false;
1262-
1263-
reader.incrementState();
1264-
1265-
case 9:
1266-
serReadVer = reader.readMessage();
1267-
1268-
if (!reader.isLastRead())
1269-
return false;
1270-
1271-
reader.incrementState();
1272-
1273-
case 10:
1274-
transformClosBytes = reader.readByteArray();
1275-
1276-
if (!reader.isLastRead())
1277-
return false;
1278-
1279-
reader.incrementState();
1280-
1281-
case 11:
1282-
ttl = reader.readLong();
1283-
1284-
if (!reader.isLastRead())
1285-
return false;
1286-
1287-
reader.incrementState();
1288-
1289-
case 12:
1290-
val = reader.readMessage();
1291-
1292-
if (!reader.isLastRead())
1293-
return false;
1294-
1295-
reader.incrementState();
1296-
1297-
}
1298-
1299-
return true;
1300-
}
1301-
1302-
/** {@inheritDoc} */
1303-
@Override public short directType() {
1304-
return 100;
1305-
}
1306-
13071060
/** {@inheritDoc} */
13081061
@Override public Class<?> deployClass() {
13091062
ClassLoader clsLdr = getClass().getClassLoader();

0 commit comments

Comments
 (0)