r/m local copy of TBinaryProtocol
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e66ec49f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e66ec49f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e66ec49f Branch: refs/heads/trunk Commit: e66ec49f810c009ba2e6bf98fbaebb76f9de622e Parents: 8aa6222 Author: Jonathan Ellis <[email protected]> Authored: Tue May 21 13:50:29 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue May 21 13:50:29 2013 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/ColumnFamilyOutputFormat.java | 1 + .../cassandra/hadoop/ColumnFamilyRecordReader.java | 3 +- .../org/apache/cassandra/hadoop/ConfigHelper.java | 1 + .../cassandra/hadoop/pig/CassandraStorage.java | 2 + .../apache/cassandra/thrift/TBinaryProtocol.java | 88 --------------- .../org/apache/cassandra/thrift/ThriftServer.java | 1 + 6 files changed, 7 insertions(+), 89 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e66ec49f/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java index 6ed9f80..d727a20 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java @@ -32,6 +32,7 @@ import org.apache.cassandra.thrift.*; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.*; import org.apache.thrift.TException; +import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.transport.TSocket; import org.apache.thrift.transport.TTransport; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e66ec49f/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java index bbf4dca..2b258b2 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java @@ -24,6 +24,8 @@ import java.nio.ByteBuffer; import java.util.*; import com.google.common.collect.*; + +import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.transport.TTransport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +51,6 @@ import org.apache.cassandra.thrift.KeySlice; import org.apache.cassandra.thrift.KsDef; import org.apache.cassandra.thrift.SlicePredicate; import org.apache.cassandra.thrift.SuperColumn; -import org.apache.cassandra.thrift.TBinaryProtocol; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e66ec49f/src/java/org/apache/cassandra/hadoop/ConfigHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java index 71e6634..90f5045 100644 --- a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java +++ b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java @@ -40,6 +40,7 @@ import org.apache.thrift.TBase; import org.apache.thrift.TDeserializer; import org.apache.thrift.TException; import org.apache.thrift.TSerializer; +import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.transport.TSocket; import org.apache.thrift.transport.TTransport; import org.apache.thrift.transport.TTransportException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e66ec49f/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java index d4fb577..16b6fdb 100644 --- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java @@ -48,6 +48,8 @@ import org.apache.pig.ResourceSchema.ResourceFieldSchema; import org.apache.thrift.TDeserializer; import org.apache.thrift.TException; import org.apache.thrift.TSerializer; +import org.apache.thrift.protocol.TBinaryProtocol; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e66ec49f/src/java/org/apache/cassandra/thrift/TBinaryProtocol.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/TBinaryProtocol.java b/src/java/org/apache/cassandra/thrift/TBinaryProtocol.java deleted file mode 100644 index cffdd1c..0000000 --- a/src/java/org/apache/cassandra/thrift/TBinaryProtocol.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.cassandra.thrift; - -import org.apache.thrift.TException; -import org.apache.thrift.protocol.TProtocol; -import org.apache.thrift.transport.TTransport; - -import java.nio.ByteBuffer; - -/** - * TODO - * This was added to support writeBinary on direct buffers for CASSANDRA-1714; - * we can remove it once we upgrade to Thrift 0.7, which incorporates the patch (THRIFT-883). - */ - -public class TBinaryProtocol extends org.apache.thrift.protocol.TBinaryProtocol -{ - public TBinaryProtocol(TTransport trans, boolean strictRead, boolean strictWrite) - { - super(trans); - strictRead_ = strictRead; - strictWrite_ = strictWrite; - } - - public static class Factory extends org.apache.thrift.protocol.TBinaryProtocol.Factory - { - public Factory() - { - super(false, true); - } - - public Factory(boolean strictRead, boolean strictWrite) - { - super(strictRead, strictWrite, 0); - } - - public TProtocol getProtocol(TTransport trans) - { - TBinaryProtocol protocol = new TBinaryProtocol(trans, strictRead_, strictWrite_); - - if (readLength_ != 0) - { - protocol.setReadLength(readLength_); - } - - return protocol; - } - } - - @Override - public void writeBinary(ByteBuffer buffer) throws TException - { - writeI32(buffer.remaining()); - - if (buffer.hasArray()) - { - trans_.write(buffer.array(), buffer.position() + buffer.arrayOffset(), buffer.remaining()); - } - else - { - byte[] bytes = new byte[buffer.remaining()]; - - int j = 0; - for (int i = buffer.position(); i < buffer.limit(); i++) - { - bytes[j++] = buffer.get(i); - } - - trans_.write(bytes); - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cassandra/blob/e66ec49f/src/java/org/apache/cassandra/thrift/ThriftServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/ThriftServer.java b/src/java/org/apache/cassandra/thrift/ThriftServer.java index 0e2663a..5f608a1 100644 --- a/src/java/org/apache/cassandra/thrift/ThriftServer.java +++ b/src/java/org/apache/cassandra/thrift/ThriftServer.java @@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.service.CassandraDaemon; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.server.TServer; import org.apache.thrift.transport.TFramedTransport;
