http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java index d1c101f..053b2a8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterDataSerializers.java @@ -41,7 +41,8 @@ public class RegisterDataSerializers extends BaseCommand { throws IOException, ClassNotFoundException { if (logger.isDebugEnabled()) { logger.debug("{}: Received register dataserializer request ({} parts) from {}", - serverConnection.getName(), clientMessage.getNumberOfParts(), serverConnection.getSocketString()); + serverConnection.getName(), clientMessage.getNumberOfParts(), + serverConnection.getSocketString()); } int noOfParts = clientMessage.getNumberOfParts(); @@ -49,10 +50,12 @@ public class RegisterDataSerializers extends BaseCommand { int noOfDataSerializers = (noOfParts - 1) / 2; // retrieve eventID from the last Part - ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(clientMessage.getPart(noOfParts - 1).getSerializedForm()); + ByteBuffer eventIdPartsBuffer = + ByteBuffer.wrap(clientMessage.getPart(noOfParts - 1).getSerializedForm()); long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); - EventID eventId = new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); + EventID eventId = + new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); byte[][] serializedDataSerializers = new byte[noOfDataSerializers * 2][]; boolean caughtCNFE = false; @@ -101,7 +104,8 @@ public class RegisterDataSerializers extends BaseCommand { } if (logger.isDebugEnabled()) { - logger.debug("Registered dataserializer for MembershipId = {}", serverConnection.getMembershipID()); + logger.debug("Registered dataserializer for MembershipId = {}", + serverConnection.getMembershipID()); } } }
http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java index 2b63337..df5a46c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java @@ -53,7 +53,8 @@ public class RegisterInstantiators extends BaseCommand { throws IOException, ClassNotFoundException { if (logger.isDebugEnabled()) { logger.debug("{}: Received register instantiator request ({} parts) from {}", - serverConnection.getName(), clientMessage.getNumberOfParts(), serverConnection.getSocketString()); + serverConnection.getName(), clientMessage.getNumberOfParts(), + serverConnection.getSocketString()); } int noOfParts = clientMessage.getNumberOfParts(); // Assert parts @@ -62,10 +63,12 @@ public class RegisterInstantiators extends BaseCommand { int noOfInstantiators = (noOfParts - 1) / 3; // retrieve eventID from the last Part - ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(clientMessage.getPart(noOfParts - 1).getSerializedForm()); + ByteBuffer eventIdPartsBuffer = + ByteBuffer.wrap(clientMessage.getPart(noOfParts - 1).getSerializedForm()); long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); - EventID eventId = new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); + EventID eventId = + new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); byte[][] serializedInstantiators = new byte[noOfInstantiators * 3][]; boolean caughtCNFE = false; @@ -102,7 +105,7 @@ public class RegisterInstantiators extends BaseCommand { } } catch (Exception e) { logger.warn(LocalizedMessage.create(LocalizedStrings.RegisterInstantiators_BAD_CLIENT, - new Object[] { serverConnection.getMembershipID(), e.getLocalizedMessage()})); + new Object[] {serverConnection.getMembershipID(), e.getLocalizedMessage()})); writeException(clientMessage, e, false, serverConnection); serverConnection.setAsTrue(RESPONDED); } @@ -134,7 +137,8 @@ public class RegisterInstantiators extends BaseCommand { } if (logger.isDebugEnabled()) { - logger.debug("Registered instantiators for MembershipId = {}", serverConnection.getMembershipID()); + logger.debug("Registered instantiators for MembershipId = {}", + serverConnection.getMembershipID()); } } http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java index afb0f2c..edd917a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java @@ -112,7 +112,8 @@ public class RegisterInterest extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug("{}: Received register interest request ({} bytes) from {} for region {} key {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), regionName, key); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), regionName, key); } // Process the register interest request @@ -138,7 +139,7 @@ public class RegisterInterest extends BaseCommand { if (region == null) { logger.info(LocalizedMessage.create( LocalizedStrings.RegisterInterest_0_REGION_NAMED_1_WAS_NOT_FOUND_DURING_REGISTER_INTEREST_REQUEST, - new Object[] { serverConnection.getName(), regionName})); + new Object[] {serverConnection.getName(), regionName})); // writeChunkedErrorResponse(msg, // MessageType.REGISTER_INTEREST_DATA_ERROR, message); // responded = true; @@ -159,8 +160,9 @@ public class RegisterInterest extends BaseCommand { key = registerContext.getKey(); } } - serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, key, - serverConnection.getProxyID(), interestType, isDurable, sendUpdatesAsInvalidates, false, 0, true); + serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, + key, serverConnection.getProxyID(), interestType, isDurable, sendUpdatesAsInvalidates, + false, 0, true); } catch (Exception e) { // If an interrupted exception is thrown , rethrow it checkForInterrupt(serverConnection, e); @@ -177,8 +179,8 @@ public class RegisterInterest extends BaseCommand { // DistributionStats.getStatTime() - start); // start = DistributionStats.getStatTime(); - CacheClientProxy ccp = - serverConnection.getAcceptor().getCacheClientNotifier().getClientProxy(serverConnection.getProxyID()); + CacheClientProxy ccp = serverConnection.getAcceptor().getCacheClientNotifier() + .getClientProxy(serverConnection.getProxyID()); if (ccp == null) { // fix for 37593 IOException ioex = new IOException( @@ -212,7 +214,8 @@ public class RegisterInterest extends BaseCommand { // Send chunk response try { - fillAndSendRegisterInterestResponseChunks(region, key, interestType, policy, serverConnection); + fillAndSendRegisterInterestResponseChunks(region, key, interestType, policy, + serverConnection); serverConnection.setAsTrue(RESPONDED); } catch (Exception e) { writeChunkedException(clientMessage, e, serverConnection, chunkedResponseMsg); @@ -224,8 +227,8 @@ public class RegisterInterest extends BaseCommand { // logger.debug(getName() + ": Sent chunk (1 of 1) of register interest // response (" + chunkedResponseMsg.getBufferLength() + " bytes) for // region " + regionName + " key " + key); - logger.debug("{}: Sent register interest response for region {} key {}", serverConnection.getName(), - regionName, key); + logger.debug("{}: Sent register interest response for region {} key {}", + serverConnection.getName(), regionName, key); } // bserverStats.incLong(writeDestroyResponseTimeId, // DistributionStats.getStatTime() - start); http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java index af423ca..bad3bed 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61.java @@ -143,7 +143,8 @@ public class RegisterInterest61 extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug( "{}: Received register interest 61 request ({} bytes) from {} for region {} key {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), regionName, key); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), regionName, key); } // test hook to trigger vMotion during register Interest @@ -176,7 +177,7 @@ public class RegisterInterest61 extends BaseCommand { if (region == null) { logger.info(LocalizedMessage.create( LocalizedStrings.RegisterInterest_0_REGION_NAMED_1_WAS_NOT_FOUND_DURING_REGISTER_INTEREST_REQUEST, - new Object[] { serverConnection.getName(), regionName})); + new Object[] {serverConnection.getName(), regionName})); // writeChunkedErrorResponse(msg, // MessageType.REGISTER_INTEREST_DATA_ERROR, message); // responded = true; @@ -198,9 +199,9 @@ public class RegisterInterest61 extends BaseCommand { key = registerContext.getKey(); } } - serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, key, - serverConnection.getProxyID(), interestType, isDurable, sendUpdatesAsInvalidates, true, - regionDataPolicyPartBytes[0], true); + serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, + key, serverConnection.getProxyID(), interestType, isDurable, sendUpdatesAsInvalidates, + true, regionDataPolicyPartBytes[0], true); } catch (Exception e) { // If an interrupted exception is thrown , rethrow it checkForInterrupt(serverConnection, e); @@ -217,8 +218,8 @@ public class RegisterInterest61 extends BaseCommand { // DistributionStats.getStatTime() - start); // start = DistributionStats.getStatTime(); - CacheClientProxy ccp = - serverConnection.getAcceptor().getCacheClientNotifier().getClientProxy(serverConnection.getProxyID()); + CacheClientProxy ccp = serverConnection.getAcceptor().getCacheClientNotifier() + .getClientProxy(serverConnection.getProxyID()); if (ccp == null) { // fix for 37593 IOException ioex = new IOException( @@ -265,8 +266,8 @@ public class RegisterInterest61 extends BaseCommand { // logger.debug(getName() + ": Sent chunk (1 of 1) of register interest // response (" + chunkedResponseMsg.getBufferLength() + " bytes) for // region " + regionName + " key " + key); - logger.debug("{}: Sent register interest response for region {} key {}", serverConnection.getName(), - regionName, key); + logger.debug("{}: Sent register interest response for region {} key {}", + serverConnection.getName(), regionName, key); } // bserverStats.incLong(writeDestroyResponseTimeId, // DistributionStats.getStatTime() - start); http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java index 4206e19..5f5fafa 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList.java @@ -124,8 +124,8 @@ public class RegisterInterestList extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug( "{}: Received register interest request ({} bytes) from {} for the following {} keys in region {}: {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), numberOfKeys, - regionName, keys); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), numberOfKeys, regionName, keys); } /* @@ -155,7 +155,8 @@ public class RegisterInterestList extends BaseCommand { } String s = errMessage.toLocalizedString(); logger.warn("{}: {}", serverConnection.getName(), s); - writeChunkedErrorResponse(clientMessage, MessageType.REGISTER_INTEREST_DATA_ERROR, s, serverConnection); + writeChunkedErrorResponse(clientMessage, MessageType.REGISTER_INTEREST_DATA_ERROR, s, + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -165,7 +166,7 @@ public class RegisterInterestList extends BaseCommand { if (region == null) { logger.info(LocalizedMessage.create( LocalizedStrings.RegisterInterestList_0_REGION_NAMED_1_WAS_NOT_FOUND_DURING_REGISTER_INTEREST_LIST_REQUEST, - new Object[] { serverConnection.getName(), regionName})); + new Object[] {serverConnection.getName(), regionName})); // writeChunkedErrorResponse(msg, // MessageType.REGISTER_INTEREST_DATA_ERROR, message); // responded = true; @@ -181,8 +182,8 @@ public class RegisterInterestList extends BaseCommand { } } // Register interest - serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, keys, - serverConnection.getProxyID(), isDurable, sendUpdatesAsInvalidates, false, 0, true); + serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, + keys, serverConnection.getProxyID(), isDurable, sendUpdatesAsInvalidates, false, 0, true); } catch (Exception ex) { // If an interrupted exception is thrown , rethrow it checkForInterrupt(serverConnection, ex); @@ -198,7 +199,7 @@ public class RegisterInterestList extends BaseCommand { // start = DistributionStats.getStatTime(); boolean isPrimary = serverConnection.getAcceptor().getCacheClientNotifier() - .getClientProxy(serverConnection.getProxyID()).isPrimary(); + .getClientProxy(serverConnection.getProxyID()).isPrimary(); if (!isPrimary) { chunkedResponseMsg.setMessageType(MessageType.RESPONSE_FROM_SECONDARY); chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId()); @@ -218,7 +219,8 @@ public class RegisterInterestList extends BaseCommand { // Send chunk response try { - fillAndSendRegisterInterestResponseChunks(region, keys, InterestType.KEY, policy, serverConnection); + fillAndSendRegisterInterestResponseChunks(region, keys, InterestType.KEY, policy, + serverConnection); serverConnection.setAsTrue(RESPONDED); } catch (Exception e) { // If an interrupted exception is thrown , rethrow it http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java index 8eb6c4a..40a3c25 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61.java @@ -134,8 +134,8 @@ public class RegisterInterestList61 extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug( "{}: Received register interest 61 request ({} bytes) from {} for the following {} keys in region {}: {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), numberOfKeys, - regionName, keys); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), numberOfKeys, regionName, keys); } /* @@ -165,7 +165,8 @@ public class RegisterInterestList61 extends BaseCommand { } String s = errMessage.toLocalizedString(); logger.warn("{}: {}", serverConnection.getName(), s); - writeChunkedErrorResponse(clientMessage, MessageType.REGISTER_INTEREST_DATA_ERROR, s, serverConnection); + writeChunkedErrorResponse(clientMessage, MessageType.REGISTER_INTEREST_DATA_ERROR, s, + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -175,7 +176,7 @@ public class RegisterInterestList61 extends BaseCommand { if (region == null) { logger.info(LocalizedMessage.create( LocalizedStrings.RegisterInterestList_0_REGION_NAMED_1_WAS_NOT_FOUND_DURING_REGISTER_INTEREST_LIST_REQUEST, - new Object[] { serverConnection.getName(), regionName})); + new Object[] {serverConnection.getName(), regionName})); // writeChunkedErrorResponse(msg, // MessageType.REGISTER_INTEREST_DATA_ERROR, message); // responded = true; @@ -191,8 +192,8 @@ public class RegisterInterestList61 extends BaseCommand { } } // Register interest - serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, keys, - serverConnection.getProxyID(), isDurable, sendUpdatesAsInvalidates, true, + serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, + keys, serverConnection.getProxyID(), isDurable, sendUpdatesAsInvalidates, true, regionDataPolicyPartBytes[0], true); } catch (Exception ex) { // If an interrupted exception is thrown , rethrow it @@ -209,7 +210,7 @@ public class RegisterInterestList61 extends BaseCommand { // start = DistributionStats.getStatTime(); boolean isPrimary = serverConnection.getAcceptor().getCacheClientNotifier() - .getClientProxy(serverConnection.getProxyID()).isPrimary(); + .getClientProxy(serverConnection.getProxyID()).isPrimary(); if (!isPrimary) { chunkedResponseMsg.setMessageType(MessageType.RESPONSE_FROM_SECONDARY); chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId()); @@ -229,7 +230,8 @@ public class RegisterInterestList61 extends BaseCommand { // Send chunk response try { - fillAndSendRegisterInterestResponseChunks(region, keys, InterestType.KEY, policy, serverConnection); + fillAndSendRegisterInterestResponseChunks(region, keys, InterestType.KEY, policy, + serverConnection); serverConnection.setAsTrue(RESPONDED); } catch (Exception e) { // If an interrupted exception is thrown , rethrow it http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java index 14198cc..6a2ad95 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66.java @@ -135,8 +135,8 @@ public class RegisterInterestList66 extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug( "{}: Received register interest 66 request ({} bytes) from {} for the following {} keys in region {}: {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), numberOfKeys, - regionName, keys); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), numberOfKeys, regionName, keys); } /* @@ -166,7 +166,8 @@ public class RegisterInterestList66 extends BaseCommand { } String s = errMessage.toLocalizedString(); logger.warn("{}: {}", serverConnection.getName(), s); - writeChunkedErrorResponse(clientMessage, MessageType.REGISTER_INTEREST_DATA_ERROR, s, serverConnection); + writeChunkedErrorResponse(clientMessage, MessageType.REGISTER_INTEREST_DATA_ERROR, s, + serverConnection); serverConnection.setAsTrue(RESPONDED); } @@ -175,7 +176,7 @@ public class RegisterInterestList66 extends BaseCommand { if (region == null) { logger.info(LocalizedMessage.create( LocalizedStrings.RegisterInterestList_0_REGION_NAMED_1_WAS_NOT_FOUND_DURING_REGISTER_INTEREST_LIST_REQUEST, - new Object[] { serverConnection.getName(), regionName})); + new Object[] {serverConnection.getName(), regionName})); // writeChunkedErrorResponse(msg, // MessageType.REGISTER_INTEREST_DATA_ERROR, message); // responded = true; @@ -191,8 +192,8 @@ public class RegisterInterestList66 extends BaseCommand { } } // Register interest - serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, keys, - serverConnection.getProxyID(), isDurable, sendUpdatesAsInvalidates, true, + serverConnection.getAcceptor().getCacheClientNotifier().registerClientInterest(regionName, + keys, serverConnection.getProxyID(), isDurable, sendUpdatesAsInvalidates, true, regionDataPolicyPartBytes[0], true); } catch (Exception ex) { // If an interrupted exception is thrown , rethrow it @@ -209,7 +210,7 @@ public class RegisterInterestList66 extends BaseCommand { // start = DistributionStats.getStatTime(); boolean isPrimary = serverConnection.getAcceptor().getCacheClientNotifier() - .getClientProxy(serverConnection.getProxyID()).isPrimary(); + .getClientProxy(serverConnection.getProxyID()).isPrimary(); if (!isPrimary) { chunkedResponseMsg.setMessageType(MessageType.RESPONSE_FROM_SECONDARY); chunkedResponseMsg.setTransactionId(clientMessage.getTransactionId()); http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java index 52a1df3..a295c54 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAll.java @@ -95,9 +95,10 @@ public class RemoveAll extends BaseCommand { LocalizedStrings.RemoveAll_THE_INPUT_REGION_NAME_FOR_THE_REMOVEALL_REQUEST_IS_NULL .toLocalizedString(); logger.warn(LocalizedMessage.create(LocalizedStrings.TWO_ARG_COLON, - new Object[] { serverConnection.getName(), txt})); + new Object[] {serverConnection.getName(), txt})); errMessage.append(txt); - writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -114,7 +115,8 @@ public class RemoveAll extends BaseCommand { ByteBuffer eventIdPartsBuffer = ByteBuffer.wrap(eventPart.getSerializedForm()); long threadId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); long sequenceId = EventID.readEventIdPartsFromOptmizedByteArray(eventIdPartsBuffer); - EventID eventId = new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); + EventID eventId = + new EventID(serverConnection.getEventMemberIDByteArray(), threadId, sequenceId); Breadcrumbs.setEventId(eventId); @@ -133,9 +135,9 @@ public class RemoveAll extends BaseCommand { if (logger.isDebugEnabled()) { StringBuilder buffer = new StringBuilder(); buffer.append(serverConnection.getName()).append(": Received removeAll request from ") - .append(serverConnection.getSocketString()).append(" for region ").append(regionName) - .append(callbackArg != null ? (" callbackArg " + callbackArg) : "").append(" with ") - .append(numberOfKeys).append(" keys."); + .append(serverConnection.getSocketString()).append(" for region ").append(regionName) + .append(callbackArg != null ? (" callbackArg " + callbackArg) : "").append(" with ") + .append(numberOfKeys).append(" keys."); logger.debug(buffer); } ArrayList<Object> keys = new ArrayList<Object>(numberOfKeys); @@ -148,9 +150,10 @@ public class RemoveAll extends BaseCommand { LocalizedStrings.RemoveAll_ONE_OF_THE_INPUT_KEYS_FOR_THE_REMOVEALL_REQUEST_IS_NULL .toLocalizedString(); logger.warn(LocalizedMessage.create(LocalizedStrings.TWO_ARG_COLON, - new Object[] { serverConnection.getName(), txt})); + new Object[] {serverConnection.getName(), txt})); errMessage.append(txt); - writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, errMessage.toString(), serverConnection); + writeChunkedErrorResponse(clientMessage, MessageType.PUT_DATA_ERROR, + errMessage.toString(), serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -180,8 +183,9 @@ public class RemoveAll extends BaseCommand { keys.add(key); } // for - if (clientMessage.getNumberOfParts() == (5 + numberOfKeys + 1)) {// it means optional timeout has been - // added + if (clientMessage.getNumberOfParts() == (5 + numberOfKeys + 1)) {// it means optional timeout + // has been + // added int timeout = clientMessage.getPart(5 + numberOfKeys).getInt(); serverConnection.setRequestSpecificTimeout(timeout); } @@ -199,8 +203,8 @@ public class RemoveAll extends BaseCommand { } } - response = region.basicBridgeRemoveAll(keys, retryVersions, serverConnection.getProxyID(), eventId, - callbackArg); + response = region.basicBridgeRemoveAll(keys, retryVersions, serverConnection.getProxyID(), + eventId, callbackArg); if (!region.getConcurrencyChecksEnabled() || clientIsEmpty || !clientHasCCEnabled) { // the client only needs this if versioning is being used and the client // has storage @@ -215,7 +219,8 @@ public class RemoveAll extends BaseCommand { if (region instanceof PartitionedRegion) { PartitionedRegion pr = (PartitionedRegion) region; if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) { - writeReplyWithRefreshMetadata(clientMessage, response, serverConnection, pr, pr.getNetworkHopType()); + writeReplyWithRefreshMetadata(clientMessage, response, serverConnection, pr, + pr.getNetworkHopType()); pr.clearNetworkHopData(); replyWithMetaData = true; } @@ -250,8 +255,9 @@ public class RemoveAll extends BaseCommand { stats.incProcessRemoveAllTime(start - oldStart); } if (logger.isDebugEnabled()) { - logger.debug("{}: Sending removeAll response back to {} for region {}{}", serverConnection.getName(), - serverConnection.getSocketString(), regionName, (logger.isTraceEnabled() ? ": " + response : "")); + logger.debug("{}: Sending removeAll response back to {} for region {}{}", + serverConnection.getName(), serverConnection.getSocketString(), regionName, + (logger.isTraceEnabled() ? ": " + response : "")); } // Increment statistics and write the reply http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java index 16333ac..cc42e0d 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveUserAuth.java @@ -53,7 +53,7 @@ public class RemoveUserAuth extends BaseCommand { } catch (GemFireSecurityException gfse) { if (serverConnection.getSecurityLogWriter().warningEnabled()) { serverConnection.getSecurityLogWriter().warning(LocalizedStrings.ONE_ARG, - serverConnection.getName() + ": Security exception: " + gfse.getMessage()); + serverConnection.getName() + ": Security exception: " + gfse.getMessage()); } writeException(clientMessage, gfse, false, serverConnection); } catch (Exception ex) { @@ -61,7 +61,7 @@ public class RemoveUserAuth extends BaseCommand { if (serverConnection.getLogWriter().warningEnabled()) { serverConnection.getLogWriter().warning( LocalizedStrings.CacheClientNotifier_AN_EXCEPTION_WAS_THROWN_FOR_CLIENT_0_1, - new Object[] { serverConnection.getProxyID(), ""}, ex); + new Object[] {serverConnection.getProxyID(), ""}, ex); } writeException(clientMessage, ex, false, serverConnection); } finally { http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java index 964b7a4..6f97d31 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Request.java @@ -52,7 +52,8 @@ public class Request extends BaseCommand { Request() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { Part regionNamePart = null, keyPart = null, valuePart = null; String regionName = null; Object callbackArg = null, key = null; @@ -94,8 +95,8 @@ public class Request extends BaseCommand { } if (logger.isDebugEnabled()) { logger.debug("{}: Received get request ({} bytes) from {} for region {} key {} txId {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), regionName, key, - clientMessage.getTransactionId()); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), regionName, key, clientMessage.getTransactionId()); } // Process the get request @@ -179,8 +180,8 @@ public class Request extends BaseCommand { if (region instanceof PartitionedRegion) { PartitionedRegion pr = (PartitionedRegion) region; if (pr.getNetworkHopType() != PartitionedRegion.NETWORK_HOP_NONE) { - writeResponseWithRefreshMetadata(data, callbackArg, clientMessage, isObject, serverConnection, pr, - pr.getNetworkHopType()); + writeResponseWithRefreshMetadata(data, callbackArg, clientMessage, isObject, + serverConnection, pr, pr.getNetworkHopType()); pr.clearNetworkHopData(); } else { writeResponse(data, callbackArg, clientMessage, isObject, serverConnection); @@ -192,7 +193,8 @@ public class Request extends BaseCommand { serverConnection.setAsTrue(RESPONDED); if (logger.isDebugEnabled()) { logger.debug("{}: Wrote get response back to {} for region {} key {} value: {}", - serverConnection.getName(), serverConnection.getSocketString(), regionName, key, data); + serverConnection.getName(), serverConnection.getSocketString(), regionName, key, + data); } stats.incWriteGetResponseTime(DistributionStats.getStatTime() - start); } http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java index 3753ed6..a6d6578 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RequestEventValue.java @@ -49,7 +49,8 @@ public class RequestEventValue extends BaseCommand { private RequestEventValue() {} - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { Part eventIDPart = null, valuePart = null; EventID event = null; Object callbackArg = null; @@ -67,7 +68,8 @@ public class RequestEventValue extends BaseCommand { LocalizedStrings.RequestEventValue_0_THE_EVENT_ID_FOR_THE_GET_EVENT_VALUE_REQUEST_IS_NULL, serverConnection.getName())); errMessage.append(" The event id for the get event value request is null."); - writeErrorResponse(clientMessage, MessageType.REQUESTDATAERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.REQUESTDATAERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); } else { try { @@ -90,8 +92,9 @@ public class RequestEventValue extends BaseCommand { } } if (logger.isTraceEnabled()) { - logger.trace("{}: Received get event value request ({} bytes) from {}", serverConnection.getName(), - clientMessage.getPayloadLength(), serverConnection.getSocketString()); + logger.trace("{}: Received get event value request ({} bytes) from {}", + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString()); } CacheClientNotifier ccn = serverConnection.getAcceptor().getCacheClientNotifier(); // Get the ha container. @@ -110,7 +113,8 @@ public class RequestEventValue extends BaseCommand { LocalizedStrings.RequestEventValue_UNABLE_TO_FIND_A_CLIENT_UPDATE_MESSAGE_FOR_0, event)); String msgStr = "No value found for " + event + " in " + haContainer.getName(); - writeErrorResponse(clientMessage, MessageType.REQUEST_EVENT_VALUE_ERROR, msgStr, serverConnection); + writeErrorResponse(clientMessage, MessageType.REQUEST_EVENT_VALUE_ERROR, msgStr, + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } else { @@ -140,10 +144,12 @@ public class RequestEventValue extends BaseCommand { writeResponse(data, callbackArg, clientMessage, isObject, serverConnection); serverConnection.setAsTrue(RESPONDED); - ccn.getClientProxy(serverConnection.getProxyID()).getStatistics().incDeltaFullMessagesSent(); + ccn.getClientProxy(serverConnection.getProxyID()).getStatistics() + .incDeltaFullMessagesSent(); if (logger.isDebugEnabled()) { logger.debug("{}: Wrote get event value response back to {} for ha container {}", - serverConnection.getName(), serverConnection.getSocketString(), haContainer.getName()); + serverConnection.getName(), serverConnection.getSocketString(), + haContainer.getName()); } } } http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java index 42e14a3..c4515ab 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Size.java @@ -76,7 +76,8 @@ public class Size extends BaseCommand { errMessage .append(LocalizedStrings.BaseCommand__THE_INPUT_REGION_NAME_FOR_THE_0_REQUEST_IS_NULL .toLocalizedString("size")); - writeErrorResponse(clientMessage, MessageType.SIZE_ERROR, errMessage.toString(), serverConnection); + writeErrorResponse(clientMessage, MessageType.SIZE_ERROR, errMessage.toString(), + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -114,7 +115,8 @@ public class Size extends BaseCommand { } } finally { if (logger.isDebugEnabled()) { - logger.debug("{}: Sent size response for region {}", serverConnection.getName(), regionName); + logger.debug("{}: Sent size response for region {}", serverConnection.getName(), + regionName); } serverConnection.setAsTrue(RESPONDED); stats.incWriteSizeResponseTime(DistributionStats.getStatTime() - start); http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java index c5b9fc5..03270d6 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/TXSynchronizationCommand.java @@ -53,7 +53,8 @@ public class TXSynchronizationCommand extends BaseCommand { * org.apache.geode.internal.cache.tier.sockets.ServerConnection) */ @Override - protected boolean shouldMasqueradeForTx(Message clientMessage, ServerConnection serverConnection) { + protected boolean shouldMasqueradeForTx(Message clientMessage, + ServerConnection serverConnection) { // masquerading is done in the waiting thread pool return false; } @@ -67,13 +68,14 @@ public class TXSynchronizationCommand extends BaseCommand { * long) */ @Override - public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, long start) - throws IOException, ClassNotFoundException, InterruptedException { + public void cmdExecute(final Message clientMessage, final ServerConnection serverConnection, + long start) throws IOException, ClassNotFoundException, InterruptedException { serverConnection.setAsTrue(REQUIRES_RESPONSE); CompletionType type = CompletionType.values()[clientMessage.getPart(0).getInt()]; - /* int txIdInt = */ clientMessage.getPart(1).getInt(); // [bruce] not sure if we need to transmit this + /* int txIdInt = */ clientMessage.getPart(1).getInt(); // [bruce] not sure if we need to + // transmit this final Part statusPart; if (type == CompletionType.AFTER_COMPLETION) { statusPart = clientMessage.getPart(2); @@ -81,7 +83,8 @@ public class TXSynchronizationCommand extends BaseCommand { statusPart = null; } - final TXManagerImpl txMgr = (TXManagerImpl) serverConnection.getCache().getCacheTransactionManager(); + final TXManagerImpl txMgr = + (TXManagerImpl) serverConnection.getCache().getCacheTransactionManager(); final InternalDistributedMember member = (InternalDistributedMember) serverConnection.getProxyID().getDistributedMember(); http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java index 597f92b..199ac18 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterest.java @@ -81,7 +81,8 @@ public class UnregisterInterest extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug( "{}: Received unregister interest request ({} bytes) from {} for region {} key {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), regionName, key); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), regionName, key); } // Process the unregister interest request @@ -96,7 +97,8 @@ public class UnregisterInterest extends BaseCommand { LocalizedStrings.UnRegisterInterest_THE_INPUT_REGION_NAME_FOR_THE_UNREGISTER_INTEREST_REQUEST_IS_NULL; String s = errMessage.toLocalizedString(); logger.warn("{}: {}", serverConnection.getName(), s); - writeErrorResponse(clientMessage, MessageType.UNREGISTER_INTEREST_DATA_ERROR, s, serverConnection); + writeErrorResponse(clientMessage, MessageType.UNREGISTER_INTEREST_DATA_ERROR, s, + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -141,8 +143,8 @@ public class UnregisterInterest extends BaseCommand { */ // Unregister interest irrelevent of whether the region is present it or // not - serverConnection.getAcceptor().getCacheClientNotifier().unregisterClientInterest(regionName, key, - interestType, isClosing, serverConnection.getProxyID(), keepalive); + serverConnection.getAcceptor().getCacheClientNotifier().unregisterClientInterest(regionName, + key, interestType, isClosing, serverConnection.getProxyID(), keepalive); // Update the statistics and write the reply // bserverStats.incLong(processDestroyTimeId, @@ -151,8 +153,8 @@ public class UnregisterInterest extends BaseCommand { writeReply(clientMessage, serverConnection); serverConnection.setAsTrue(RESPONDED); if (logger.isDebugEnabled()) { - logger.debug("{}: Sent unregister interest response for region {} key {}", serverConnection.getName(), - regionName, key); + logger.debug("{}: Sent unregister interest response for region {} key {}", + serverConnection.getName(), regionName, key); } // bserverStats.incLong(writeDestroyResponseTimeId, // DistributionStats.getStatTime() - start); http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java index 76cbba2..1968bff 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java @@ -95,8 +95,8 @@ public class UnregisterInterestList extends BaseCommand { if (logger.isDebugEnabled()) { logger.debug( "{}: Received unregister interest request ({} bytes) from {} for the following {} keys in region {}: {}", - serverConnection.getName(), clientMessage.getPayloadLength(), serverConnection.getSocketString(), numberOfKeys, - regionName, keys); + serverConnection.getName(), clientMessage.getPayloadLength(), + serverConnection.getSocketString(), numberOfKeys, regionName, keys); } // Process the unregister interest request @@ -114,7 +114,8 @@ public class UnregisterInterestList extends BaseCommand { } String s = errMessage.toLocalizedString(); logger.warn("{}: {}", serverConnection.getName(), s); - writeErrorResponse(clientMessage, MessageType.UNREGISTER_INTEREST_DATA_ERROR, s, serverConnection); + writeErrorResponse(clientMessage, MessageType.UNREGISTER_INTEREST_DATA_ERROR, s, + serverConnection); serverConnection.setAsTrue(RESPONDED); return; } @@ -155,8 +156,8 @@ public class UnregisterInterestList extends BaseCommand { * responded = true; } else { */ // Register interest - serverConnection.getAcceptor().getCacheClientNotifier().unregisterClientInterest(regionName, keys, - isClosingList, serverConnection.getProxyID(), keepalive); + serverConnection.getAcceptor().getCacheClientNotifier().unregisterClientInterest(regionName, + keys, isClosingList, serverConnection.getProxyID(), keepalive); // Update the statistics and write the reply // bserverStats.incLong(processDestroyTimeId, http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java index b870a96..2f434fb 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UpdateClientNotification.java @@ -35,7 +35,8 @@ public class UpdateClientNotification extends BaseCommand { private UpdateClientNotification() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { CacheServerStats stats = serverConnection.getCacheServerStats(); { long oldStart = start; http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java index 72719b2..18929eb 100644 --- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java +++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseCQ.java @@ -44,7 +44,8 @@ public class CloseCQ extends BaseCQCommand { private CloseCQ() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); ClientProxyMembershipID id = serverConnection.getProxyID(); CacheServerStats stats = serverConnection.getCacheServerStats(); @@ -67,7 +68,8 @@ public class CloseCQ extends BaseCQCommand { if (cqName == null) { String err = LocalizedStrings.CloseCQ_THE_CQNAME_FOR_THE_CQ_CLOSE_REQUEST_IS_NULL.toLocalizedString(); - sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), null, serverConnection); + sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), null, + serverConnection); return; } @@ -104,19 +106,21 @@ public class CloseCQ extends BaseCQCommand { if (cqQuery != null) serverConnection.removeCq(cqName, cqQuery.isDurable()); } catch (CqException cqe) { - sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe, serverConnection); + sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe, + serverConnection); return; } catch (Exception e) { String err = LocalizedStrings.CloseCQ_EXCEPTION_WHILE_CLOSING_CQ_CQNAME_0.toLocalizedString(cqName); - sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, clientMessage.getTransactionId(), e, serverConnection); + sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, clientMessage.getTransactionId(), e, + serverConnection); return; } // Send OK to client sendCqResponse(MessageType.REPLY, - LocalizedStrings.CloseCQ_CQ_CLOSED_SUCCESSFULLY.toLocalizedString(), clientMessage.getTransactionId(), - null, serverConnection); + LocalizedStrings.CloseCQ_CQ_CLOSED_SUCCESSFULLY.toLocalizedString(), + clientMessage.getTransactionId(), null, serverConnection); serverConnection.setAsTrue(RESPONDED); { http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java index d2a4453..86d53f5 100644 --- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java +++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ.java @@ -71,9 +71,9 @@ public class ExecuteCQ extends BaseCQCommand { byte[] isDurableByte = isDurablePart.getSerializedForm(); boolean isDurable = (isDurableByte == null || isDurableByte[0] == 0) ? false : true; if (logger.isDebugEnabled()) { - logger.debug("{}: Received {} request from {} CqName: {} queryString: {}", serverConnection.getName(), - MessageType.getString(clientMessage.getMessageType()), serverConnection.getSocketString(), cqName, - cqQueryString); + logger.debug("{}: Received {} request from {} CqName: {} queryString: {}", + serverConnection.getName(), MessageType.getString(clientMessage.getMessageType()), + serverConnection.getSocketString(), cqName, cqQueryString); } DefaultQueryService qService = null; @@ -108,7 +108,8 @@ public class ExecuteCQ extends BaseCQCommand { cqQuery = cqServiceForExec.executeCq(cqName, cqQueryString, cqState, id, acceptor.getCacheClientNotifier(), isDurable, false, 0, null); } catch (CqException cqe) { - sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe, serverConnection); + sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe, + serverConnection); return; } catch (Exception e) { writeChunkedException(clientMessage, e, serverConnection); @@ -130,8 +131,8 @@ public class ExecuteCQ extends BaseCQCommand { cqRegionNames = ((DefaultQuery) query).getRegionsInQuery(null); } ((DefaultQuery) query).setIsCqQuery(true); - successQuery = processQuery(clientMessage, query, cqQueryString, cqRegionNames, start, cqQuery, - executeCQContext, serverConnection, sendResults); + successQuery = processQuery(clientMessage, query, cqQueryString, cqRegionNames, start, + cqQuery, executeCQContext, serverConnection, sendResults); // Update the CQ statistics. cqQuery.getVsdStats().setCqInitialResultsTime((DistributionStats.getStatTime()) - oldstart); http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java index 805ee48..fcc45de 100755 --- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java +++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteCQ61.java @@ -82,9 +82,9 @@ public class ExecuteCQ61 extends BaseCQCommand { Part regionDataPolicyPart = clientMessage.getPart(clientMessage.getNumberOfParts() - 1); byte[] regionDataPolicyPartBytes = regionDataPolicyPart.getSerializedForm(); if (logger.isDebugEnabled()) { - logger.debug("{}: Received {} request from {} CqName: {} queryString: {}", serverConnection.getName(), - MessageType.getString(clientMessage.getMessageType()), serverConnection.getSocketString(), cqName, - cqQueryString); + logger.debug("{}: Received {} request from {} CqName: {} queryString: {}", + serverConnection.getName(), MessageType.getString(clientMessage.getMessageType()), + serverConnection.getSocketString(), cqName, cqQueryString); } // Check if the Server is running in NotifyBySubscription=true mode. @@ -96,7 +96,8 @@ public class ExecuteCQ61 extends BaseCQCommand { String err = LocalizedStrings.ExecuteCQ_SERVER_NOTIFYBYSUBSCRIPTION_MODE_IS_SET_TO_FALSE_CQ_EXECUTION_IS_NOT_SUPPORTED_IN_THIS_MODE .toLocalizedString(); - sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), null, serverConnection); + sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), + null, serverConnection); return; } } @@ -144,7 +145,8 @@ public class ExecuteCQ61 extends BaseCQCommand { cqQuery = (ServerCQImpl) cqServiceForExec.executeCq(cqName, cqQueryString, cqState, id, ccn, isDurable, true, regionDataPolicyPartBytes[0], null); } catch (CqException cqe) { - sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe, serverConnection); + sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe, + serverConnection); serverConnection.removeCq(cqName, isDurable); return; } catch (Exception e) { @@ -172,8 +174,8 @@ public class ExecuteCQ61 extends BaseCQCommand { cqRegionNames = ((DefaultQuery) query).getRegionsInQuery(null); } ((DefaultQuery) query).setIsCqQuery(true); - successQuery = processQuery(clientMessage, query, cqQueryString, cqRegionNames, start, cqQuery, - executeCQContext, serverConnection, sendResults); + successQuery = processQuery(clientMessage, query, cqQueryString, cqRegionNames, start, + cqQuery, executeCQContext, serverConnection, sendResults); // Update the CQ statistics. http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java index b1faeee..0fab303 100644 --- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java +++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetCQStats.java @@ -36,7 +36,8 @@ public class GetCQStats extends BaseCQCommand { private GetCQStats() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); CacheServerStats stats = serverConnection.getCacheServerStats(); @@ -61,7 +62,8 @@ public class GetCQStats extends BaseCQCommand { // Process the query request if (cqName == null) { String err = "The cqName for the cq stats request is null"; - sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), null, serverConnection); + sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), null, + serverConnection); return; } @@ -74,11 +76,13 @@ public class GetCQStats extends BaseCQCommand { cqService.start(); } catch (Exception e) { String err = "Exception while Getting the CQ Statistics. "; - sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, clientMessage.getTransactionId(), e, serverConnection); + sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, clientMessage.getTransactionId(), e, + serverConnection); return; } // Send OK to client - sendCqResponse(MessageType.REPLY, "cq stats sent successfully.", clientMessage.getTransactionId(), null, serverConnection); + sendCqResponse(MessageType.REPLY, "cq stats sent successfully.", + clientMessage.getTransactionId(), null, serverConnection); serverConnection.setAsTrue(RESPONDED); { http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java index e39c8e1..c14bd72 100755 --- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java +++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GetDurableCQs.java @@ -56,7 +56,8 @@ public class GetDurableCQs extends BaseCQCommand { if (logger.isDebugEnabled()) { logger.debug("{}: Received {} request from {}", serverConnection.getName(), - MessageType.getString(clientMessage.getMessageType()), serverConnection.getSocketString()); + MessageType.getString(clientMessage.getMessageType()), + serverConnection.getSocketString()); } DefaultQueryService qService = null; @@ -87,8 +88,8 @@ public class GetDurableCQs extends BaseCQCommand { Object durableCqName = it.next(); durableCqList.add(durableCqName); if (isTraceEnabled) { - logger.trace("{}: getDurableCqsResponse <{}>; list size was {}", serverConnection.getName(), - durableCqName, durableCqList.size()); + logger.trace("{}: getDurableCqsResponse <{}>; list size was {}", + serverConnection.getName(), durableCqName, durableCqList.size()); } if (durableCqList.size() == MAXIMUM_CHUNK_SIZE) { // Send the chunk and clear the list @@ -100,7 +101,8 @@ public class GetDurableCQs extends BaseCQCommand { sendDurableCqsResponseChunk(durableCqList, true, serverConnection); } catch (CqException cqe) { - sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe, serverConnection); + sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe, + serverConnection); return; } catch (Exception e) { writeChunkedException(clientMessage, e, serverConnection); http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java index 5393e81..5f0118b 100644 --- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java +++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MonitorCQ.java @@ -36,7 +36,8 @@ public class MonitorCQ extends BaseCQCommand { private MonitorCQ() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); serverConnection.setAsTrue(REQUIRES_RESPONSE); serverConnection.setAsTrue(REQUIRES_CHUNKED_RESPONSE); @@ -47,7 +48,8 @@ public class MonitorCQ extends BaseCQCommand { // This should have been taken care at the client - remove? String err = LocalizedStrings.MonitorCQ__0_THE_MONITORCQ_OPERATION_IS_INVALID .toLocalizedString(serverConnection.getName()); - sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), null, serverConnection); + sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), null, + serverConnection); return; } @@ -60,14 +62,16 @@ public class MonitorCQ extends BaseCQCommand { String err = LocalizedStrings.MonitorCQ__0_A_NULL_REGION_NAME_WAS_PASSED_FOR_MONITORCQ_OPERATION .toLocalizedString(serverConnection.getName()); - sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), null, serverConnection); + sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), + null, serverConnection); return; } } if (logger.isDebugEnabled()) { logger.debug("{}: Received MonitorCq request from {} op: {}{}", serverConnection.getName(), - serverConnection.getSocketString(), op, (regionName != null) ? " RegionName: " + regionName : ""); + serverConnection.getSocketString(), op, + (regionName != null) ? " RegionName: " + regionName : ""); } this.securityService.authorizeClusterRead(); @@ -84,12 +88,14 @@ public class MonitorCQ extends BaseCQCommand { throw new CqException( LocalizedStrings.CqService_INVALID_CQ_MONITOR_REQUEST_RECEIVED.toLocalizedString()); } catch (CqException cqe) { - sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe, serverConnection); + sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe, + serverConnection); return; } catch (Exception e) { String err = LocalizedStrings.MonitorCQ_EXCEPTION_WHILE_HANDLING_THE_MONITOR_REQUEST_OP_IS_0 .toLocalizedString(Integer.valueOf(op)); - sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, clientMessage.getTransactionId(), e, serverConnection); + sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, clientMessage.getTransactionId(), e, + serverConnection); return; } } http://git-wip-us.apache.org/repos/asf/geode/blob/ad7604ab/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java index 070cb04..99fbef1 100644 --- a/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java +++ b/geode-cq/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/StopCQ.java @@ -44,7 +44,8 @@ public class StopCQ extends BaseCQCommand { private StopCQ() {} @Override - public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) throws IOException { + public void cmdExecute(Message clientMessage, ServerConnection serverConnection, long start) + throws IOException { CachedRegionHelper crHelper = serverConnection.getCachedRegionHelper(); ClientProxyMembershipID id = serverConnection.getProxyID(); CacheServerStats stats = serverConnection.getCacheServerStats(); @@ -67,7 +68,8 @@ public class StopCQ extends BaseCQCommand { if (cqName == null) { String err = LocalizedStrings.StopCQ_THE_CQNAME_FOR_THE_CQ_STOP_REQUEST_IS_NULL.toLocalizedString(); - sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), null, serverConnection); + sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, clientMessage.getTransactionId(), null, + serverConnection); return; } @@ -102,19 +104,21 @@ public class StopCQ extends BaseCQCommand { if (cqQuery != null) serverConnection.removeCq(cqName, cqQuery.isDurable()); } catch (CqException cqe) { - sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe, serverConnection); + sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", clientMessage.getTransactionId(), cqe, + serverConnection); return; } catch (Exception e) { String err = LocalizedStrings.StopCQ_EXCEPTION_WHILE_STOPPING_CQ_NAMED_0.toLocalizedString(cqName); - sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, clientMessage.getTransactionId(), e, serverConnection); + sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, clientMessage.getTransactionId(), e, + serverConnection); return; } // Send OK to client sendCqResponse(MessageType.REPLY, - LocalizedStrings.StopCQ_CQ_STOPPED_SUCCESSFULLY.toLocalizedString(), clientMessage.getTransactionId(), - null, serverConnection); + LocalizedStrings.StopCQ_CQ_STOPPED_SUCCESSFULLY.toLocalizedString(), + clientMessage.getTransactionId(), null, serverConnection); serverConnection.setAsTrue(RESPONDED);