anton-vinogradov commented on code in PR #13095:
URL: https://github.com/apache/ignite/pull/13095#discussion_r3579788821
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java:
##########
@@ -1931,12 +1931,12 @@ private void submit(
else {
try {
for (DataStreamerEntry e : entries) {
- e.getKey().prepareMarshal(cacheObjCtx);
+ e.getKey().marshal(cacheObjCtx);
Review Comment:
Not duplicated — this is master's own manual call, only the `CacheObject`
method got renamed (`prepareMarshal` → `marshal`). The data streamer marshals
its entries' key/value eagerly here (for its client-side buffering, with the
specific `cacheObjCtx`), exactly as before. And even where the generated
`DataStreamerEntry` marshaller later touches the same key/val,
`CacheObject.marshal` is idempotent (`valBytes == null` guard), so a second
pass is a no-op.
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java:
##########
@@ -1931,12 +1931,12 @@ private void submit(
else {
try {
for (DataStreamerEntry e : entries) {
- e.getKey().prepareMarshal(cacheObjCtx);
+ e.getKey().marshal(cacheObjCtx);
CacheObject val = e.getValue();
if (val != null)
- val.prepareMarshal(cacheObjCtx);
+ val.marshal(cacheObjCtx);
Review Comment:
Same — see above (idempotent `CacheObject.marshal`).
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java:
##########
@@ -2253,7 +2253,7 @@ protected static class IsolatedUpdater implements
StreamReceiver<KeyCacheObject,
cctx.shared().database().checkpointReadLock();
try {
- e.getKey().finishUnmarshal(cctx.cacheObjectContext(),
cctx.deploy().globalLoader());
+ e.getKey().unmarshal(cctx.cacheObjectContext(),
cctx.deploy().globalLoader());
Review Comment:
Not duplicated — master's own manual call, only the method rename
(`finishUnmarshal` → `unmarshal`); the receiver unmarshals key/val here as
before, and `CacheObject.unmarshal` is guarded (`val == null`), so a repeat is
a no-op.
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java:
##########
@@ -117,14 +117,14 @@ class DataStreamerUpdateJob implements
GridPlainCallable<Object> {
final GridCacheContext cctx = cache.context();
for (DataStreamerEntry e : col) {
- e.getKey().finishUnmarshal(cctx.cacheObjectContext(),
cctx.deploy().globalLoader());
+ e.getKey().unmarshal(cctx.cacheObjectContext(),
cctx.deploy().globalLoader());
Review Comment:
Same — master's call, method rename only; `unmarshal` is guarded.
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateJob.java:
##########
@@ -117,14 +117,14 @@ class DataStreamerUpdateJob implements
GridPlainCallable<Object> {
final GridCacheContext cctx = cache.context();
for (DataStreamerEntry e : col) {
- e.getKey().finishUnmarshal(cctx.cacheObjectContext(),
cctx.deploy().globalLoader());
+ e.getKey().unmarshal(cctx.cacheObjectContext(),
cctx.deploy().globalLoader());
CacheObject val = e.getValue();
if (val != null) {
checkSecurityPermission(SecurityPermission.CACHE_PUT);
- val.finishUnmarshal(cctx.cacheObjectContext(),
cctx.deploy().globalLoader());
+ val.unmarshal(cctx.cacheObjectContext(),
cctx.deploy().globalLoader());
Review Comment:
Same as above.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
