Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 0bc0db049 -> 5f2e22055
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbf304eb/src/java/org/apache/cassandra/transport/messages/QueryMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/QueryMessage.java b/src/java/org/apache/cassandra/transport/messages/QueryMessage.java index c5ff143..0a31dfe 100644 --- a/src/java/org/apache/cassandra/transport/messages/QueryMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/QueryMessage.java @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.UUID; import com.google.common.collect.ImmutableMap; -import org.jboss.netty.buffer.ChannelBuffer; +import io.netty.buffer.ByteBuf; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.QueryOptions; @@ -40,7 +40,7 @@ public class QueryMessage extends Message.Request { public static final Message.Codec<QueryMessage> codec = new Message.Codec<QueryMessage>() { - public QueryMessage decode(ChannelBuffer body, int version) + public QueryMessage decode(ByteBuf body, int version) { String query = CBUtil.readLongString(body); if (version == 1) @@ -54,7 +54,7 @@ public class QueryMessage extends Message.Request } } - public void encode(QueryMessage msg, ChannelBuffer dest, int version) + public void encode(QueryMessage msg, ByteBuf dest, int version) { CBUtil.writeLongString(msg.query, dest); if (version == 1) http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbf304eb/src/java/org/apache/cassandra/transport/messages/ReadyMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/ReadyMessage.java b/src/java/org/apache/cassandra/transport/messages/ReadyMessage.java index 40464eb..f0a4681 100644 --- a/src/java/org/apache/cassandra/transport/messages/ReadyMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ReadyMessage.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.transport.messages; -import org.jboss.netty.buffer.ChannelBuffer; +import io.netty.buffer.ByteBuf; import org.apache.cassandra.transport.Message; @@ -28,12 +28,12 @@ public class ReadyMessage extends Message.Response { public static final Message.Codec<ReadyMessage> codec = new Message.Codec<ReadyMessage>() { - public ReadyMessage decode(ChannelBuffer body, int version) + public ReadyMessage decode(ByteBuf body, int version) { return new ReadyMessage(); } - public void encode(ReadyMessage msg, ChannelBuffer dest, int version) + public void encode(ReadyMessage msg, ByteBuf dest, int version) { } http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbf304eb/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java b/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java index 834d584..ee410bb 100644 --- a/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java @@ -20,7 +20,7 @@ package org.apache.cassandra.transport.messages; import java.util.ArrayList; import java.util.List; -import org.jboss.netty.buffer.ChannelBuffer; +import io.netty.buffer.ByteBuf; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.transport.*; @@ -29,7 +29,7 @@ public class RegisterMessage extends Message.Request { public static final Message.Codec<RegisterMessage> codec = new Message.Codec<RegisterMessage>() { - public RegisterMessage decode(ChannelBuffer body, int version) + public RegisterMessage decode(ByteBuf body, int version) { int length = body.readUnsignedShort(); List<Event.Type> eventTypes = new ArrayList<Event.Type>(length); @@ -38,7 +38,7 @@ public class RegisterMessage extends Message.Request return new RegisterMessage(eventTypes); } - public void encode(RegisterMessage msg, ChannelBuffer dest, int version) + public void encode(RegisterMessage msg, ByteBuf dest, int version) { dest.writeShort(msg.eventTypes.size()); for (Event.Type type : msg.eventTypes) http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbf304eb/src/java/org/apache/cassandra/transport/messages/ResultMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java index 0a57fee..7ca9251 100644 --- a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java @@ -19,7 +19,7 @@ package org.apache.cassandra.transport.messages; import java.util.*; -import org.jboss.netty.buffer.ChannelBuffer; +import io.netty.buffer.ByteBuf; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.CQLStatement; @@ -36,13 +36,13 @@ public abstract class ResultMessage extends Message.Response { public static final Message.Codec<ResultMessage> codec = new Message.Codec<ResultMessage>() { - public ResultMessage decode(ChannelBuffer body, int version) + public ResultMessage decode(ByteBuf body, int version) { Kind kind = Kind.fromId(body.readInt()); return kind.subcodec.decode(body, version); } - public void encode(ResultMessage msg, ChannelBuffer dest, int version) + public void encode(ResultMessage msg, ByteBuf dest, int version) { dest.writeInt(msg.kind.id); msg.kind.subcodec.encode(msg, dest, version); @@ -116,12 +116,12 @@ public abstract class ResultMessage extends Message.Response public static final Message.Codec<ResultMessage> subcodec = new Message.Codec<ResultMessage>() { - public ResultMessage decode(ChannelBuffer body, int version) + public ResultMessage decode(ByteBuf body, int version) { return new Void(); } - public void encode(ResultMessage msg, ChannelBuffer dest, int version) + public void encode(ResultMessage msg, ByteBuf dest, int version) { assert msg instanceof Void; } @@ -156,13 +156,13 @@ public abstract class ResultMessage extends Message.Response public static final Message.Codec<ResultMessage> subcodec = new Message.Codec<ResultMessage>() { - public ResultMessage decode(ChannelBuffer body, int version) + public ResultMessage decode(ByteBuf body, int version) { String keyspace = CBUtil.readString(body); return new SetKeyspace(keyspace); } - public void encode(ResultMessage msg, ChannelBuffer dest, int version) + public void encode(ResultMessage msg, ByteBuf dest, int version) { assert msg instanceof SetKeyspace; CBUtil.writeString(((SetKeyspace)msg).keyspace, dest); @@ -191,12 +191,12 @@ public abstract class ResultMessage extends Message.Response { public static final Message.Codec<ResultMessage> subcodec = new Message.Codec<ResultMessage>() { - public ResultMessage decode(ChannelBuffer body, int version) + public ResultMessage decode(ByteBuf body, int version) { return new Rows(ResultSet.codec.decode(body, version)); } - public void encode(ResultMessage msg, ChannelBuffer dest, int version) + public void encode(ResultMessage msg, ByteBuf dest, int version) { assert msg instanceof Rows; Rows rowMsg = (Rows)msg; @@ -236,7 +236,7 @@ public abstract class ResultMessage extends Message.Response { public static final Message.Codec<ResultMessage> subcodec = new Message.Codec<ResultMessage>() { - public ResultMessage decode(ChannelBuffer body, int version) + public ResultMessage decode(ByteBuf body, int version) { MD5Digest id = MD5Digest.wrap(CBUtil.readBytes(body)); ResultSet.Metadata metadata = ResultSet.Metadata.codec.decode(body, version); @@ -248,7 +248,7 @@ public abstract class ResultMessage extends Message.Response return new Prepared(id, -1, metadata, resultMetadata); } - public void encode(ResultMessage msg, ChannelBuffer dest, int version) + public void encode(ResultMessage msg, ByteBuf dest, int version) { assert msg instanceof Prepared; Prepared prepared = (Prepared)msg; @@ -356,7 +356,7 @@ public abstract class ResultMessage extends Message.Response public static final Message.Codec<ResultMessage> subcodec = new Message.Codec<ResultMessage>() { - public ResultMessage decode(ChannelBuffer body, int version) + public ResultMessage decode(ByteBuf body, int version) { Change change = CBUtil.readEnumValue(Change.class, body); String keyspace = CBUtil.readString(body); @@ -365,7 +365,7 @@ public abstract class ResultMessage extends Message.Response } - public void encode(ResultMessage msg, ChannelBuffer dest, int version) + public void encode(ResultMessage msg, ByteBuf dest, int version) { assert msg instanceof SchemaChange; SchemaChange scm = (SchemaChange)msg; http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbf304eb/src/java/org/apache/cassandra/transport/messages/StartupMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/StartupMessage.java b/src/java/org/apache/cassandra/transport/messages/StartupMessage.java index d2b4350..1a5071f 100644 --- a/src/java/org/apache/cassandra/transport/messages/StartupMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/StartupMessage.java @@ -20,7 +20,7 @@ package org.apache.cassandra.transport.messages; import java.util.HashMap; import java.util.Map; -import org.jboss.netty.buffer.ChannelBuffer; +import io.netty.buffer.ByteBuf; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.InvalidRequestException; @@ -40,12 +40,12 @@ public class StartupMessage extends Message.Request public static final Message.Codec<StartupMessage> codec = new Message.Codec<StartupMessage>() { - public StartupMessage decode(ChannelBuffer body, int version) + public StartupMessage decode(ByteBuf body, int version) { return new StartupMessage(upperCaseKeys(CBUtil.readStringMap(body))); } - public void encode(StartupMessage msg, ChannelBuffer dest, int version) + public void encode(StartupMessage msg, ByteBuf dest, int version) { CBUtil.writeStringMap(msg.options, dest); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbf304eb/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java b/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java index 1ec9b51..539085f 100644 --- a/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java @@ -20,7 +20,7 @@ package org.apache.cassandra.transport.messages; import java.util.List; import java.util.Map; -import org.jboss.netty.buffer.ChannelBuffer; +import io.netty.buffer.ByteBuf; import org.apache.cassandra.transport.CBUtil; import org.apache.cassandra.transport.Message; @@ -32,12 +32,12 @@ public class SupportedMessage extends Message.Response { public static final Message.Codec<SupportedMessage> codec = new Message.Codec<SupportedMessage>() { - public SupportedMessage decode(ChannelBuffer body, int version) + public SupportedMessage decode(ByteBuf body, int version) { return new SupportedMessage(CBUtil.readStringToStringListMap(body)); } - public void encode(SupportedMessage msg, ChannelBuffer dest, int version) + public void encode(SupportedMessage msg, ByteBuf dest, int version) { CBUtil.writeStringToStringListMap(msg.supported, dest); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/cbf304eb/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java index f50aa81..f216c05 100644 --- a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java +++ b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java @@ -17,16 +17,14 @@ */ package org.apache.cassandra.stress.util; -import java.nio.ByteBuffer; import java.util.List; import javax.net.ssl.SSLContext; import com.datastax.driver.core.*; import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.security.SSLFactory; -import org.apache.cassandra.utils.FBUtilities; -import org.jboss.netty.logging.InternalLoggerFactory; -import org.jboss.netty.logging.Slf4JLoggerFactory; +import io.netty.util.internal.logging.InternalLoggerFactory; +import io.netty.util.internal.logging.Slf4JLoggerFactory; public class JavaDriverClient {
