You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2012/09/05 21:47:17 UTC
svn commit: r1381323 [4/5] - in /thrift/trunk: compiler/cpp/src/generate/
lib/php/ lib/php/lib/ lib/php/lib/Thrift/ lib/php/lib/Thrift/Base/
lib/php/lib/Thrift/ClassLoader/ lib/php/lib/Thrift/Exception/
lib/php/lib/Thrift/Factory/ lib/php/lib/Thrift/Pr...
Modified: thrift/trunk/lib/php/src/protocol/TCompactProtocol.php
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/php/src/protocol/TCompactProtocol.php?rev=1381323&r1=1381322&r2=1381323&view=diff
==============================================================================
--- thrift/trunk/lib/php/src/protocol/TCompactProtocol.php (original)
+++ thrift/trunk/lib/php/src/protocol/TCompactProtocol.php Wed Sep 5 19:47:14 2012
@@ -1,678 +0,0 @@
-<?php
-/*
- * 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 thrift.protocol
- */
-
-include_once $GLOBALS['THRIFT_ROOT'].'/transport/TBufferedTransport.php';
-
-/**
- * Compact implementation of the Thrift protocol.
- *
- */
-class TCompactProtocol extends TProtocol {
-
- const COMPACT_STOP = 0x00;
- const COMPACT_TRUE = 0x01;
- const COMPACT_FALSE = 0x02;
- const COMPACT_BYTE = 0x03;
- const COMPACT_I16 = 0x04;
- const COMPACT_I32 = 0x05;
- const COMPACT_I64 = 0x06;
- const COMPACT_DOUBLE = 0x07;
- const COMPACT_BINARY = 0x08;
- const COMPACT_LIST = 0x09;
- const COMPACT_SET = 0x0A;
- const COMPACT_MAP = 0x0B;
- const COMPACT_STRUCT = 0x0C;
-
- const STATE_CLEAR = 0;
- const STATE_FIELD_WRITE = 1;
- const STATE_VALUE_WRITE = 2;
- const STATE_CONTAINER_WRITE = 3;
- const STATE_BOOL_WRITE = 4;
- const STATE_FIELD_READ = 5;
- const STATE_CONTAINER_READ = 6;
- const STATE_VALUE_READ = 7;
- const STATE_BOOL_READ = 8;
-
- const VERSION_MASK = 0x1f;
- const VERSION = 1;
- const PROTOCOL_ID = 0x82;
- const TYPE_MASK = 0xe0;
- const TYPE_SHIFT_AMOUNT = 5;
-
- protected static $ctypes = array(
- TType::STOP => TCompactProtocol::COMPACT_STOP,
- TType::BOOL => TCompactProtocol::COMPACT_TRUE, // used for collection
- TType::BYTE => TCompactProtocol::COMPACT_BYTE,
- TType::I16 => TCompactProtocol::COMPACT_I16,
- TType::I32 => TCompactProtocol::COMPACT_I32,
- TType::I64 => TCompactProtocol::COMPACT_I64,
- TType::DOUBLE => TCompactProtocol::COMPACT_DOUBLE,
- TType::STRING => TCompactProtocol::COMPACT_BINARY,
- TType::STRUCT => TCompactProtocol::COMPACT_STRUCT,
- TType::LST => TCompactProtocol::COMPACT_LIST,
- TType::SET => TCompactProtocol::COMPACT_SET,
- TType::MAP => TCompactProtocol::COMPACT_MAP,
- );
-
- protected static $ttypes = array(
- TCompactProtocol::COMPACT_STOP => TType::STOP ,
- TCompactProtocol::COMPACT_TRUE => TType::BOOL, // used for collection
- TCompactProtocol::COMPACT_FALSE => TType::BOOL,
- TCompactProtocol::COMPACT_BYTE => TType::BYTE,
- TCompactProtocol::COMPACT_I16 => TType::I16,
- TCompactProtocol::COMPACT_I32 => TType::I32,
- TCompactProtocol::COMPACT_I64 => TType::I64,
- TCompactProtocol::COMPACT_DOUBLE => TType::DOUBLE,
- TCompactProtocol::COMPACT_BINARY => TType::STRING,
- TCompactProtocol::COMPACT_STRUCT => TType::STRUCT,
- TCompactProtocol::COMPACT_LIST => TType::LST,
- TCompactProtocol::COMPACT_SET => TType::SET,
- TCompactProtocol::COMPACT_MAP => TType::MAP,
- );
-
- protected $state = TCompactProtocol::STATE_CLEAR;
- protected $lastFid = 0;
- protected $boolFid = null;
- protected $boolValue = null;
- protected $structs = array();
- protected $containers = array();
-
- // Some varint / zigzag helper methods
- public function toZigZag($n, $bits) {
- return ($n << 1) ^ ($n >> ($bits - 1));
- }
-
- public function fromZigZag($n) {
- return ($n >> 1) ^ -($n & 1);
- }
-
- public function getVarint($data) {
- $out = "";
- while (true) {
- if (($data & ~0x7f) === 0) {
- $out .= chr($data);
- break;
- } else {
- $out .= chr(($data & 0xff) | 0x80);
- $data = $data >> 7;
- }
- }
- return $out;
- }
-
- public function writeVarint($data) {
- $out = $this->getVarint($data);
- $result = TStringFuncFactory::create()->strlen($out);
- $this->trans_->write($out, $result);
- return $result;
- }
-
- public function readVarint(&$result) {
- $idx = 0;
- $shift = 0;
- $result = 0;
- while (true) {
- $x = $this->trans_->readAll(1);
- $arr = unpack('C', $x);
- $byte = $arr[1];
- $idx += 1;
- $result |= ($byte & 0x7f) << $shift;
- if (($byte >> 7) === 0) {
- return $idx;
- }
- $shift += 7;
- }
-
- return $idx;
- }
-
- public function __construct($trans) {
- parent::__construct($trans);
- }
-
- public function writeMessageBegin($name, $type, $seqid) {
- $written =
- $this->writeUByte(TCompactProtocol::PROTOCOL_ID) +
- $this->writeUByte(TCompactProtocol::VERSION |
- ($type << TCompactProtocol::TYPE_SHIFT_AMOUNT)) +
- $this->writeVarint($seqid) +
- $this->writeString($name);
- $this->state = TCompactProtocol::STATE_VALUE_WRITE;
- return $written;
- }
-
- public function writeMessageEnd() {
- $this->state = TCompactProtocol::STATE_CLEAR;
- return 0;
- }
-
- public function writeStructBegin($name) {
- $this->structs[] = array($this->state, $this->lastFid);
- $this->state = TCompactProtocol::STATE_FIELD_WRITE;
- $this->lastFid = 0;
- return 0;
- }
-
- public function writeStructEnd() {
- $old_values = array_pop($this->structs);
- $this->state = $old_values[0];
- $this->lastFid = $old_values[1];
- return 0;
- }
-
- public function writeFieldStop() {
- return $this->writeByte(0);
- }
-
- public function writeFieldHeader($type, $fid) {
- $written = 0;
- $delta = $fid - $this->lastFid;
- if (0 < $delta && $delta <= 15) {
- $written = $this->writeUByte(($delta << 4) | $type);
- } else {
- $written = $this->writeByte($type) +
- $this->writeI16($fid);
- }
- $this->lastFid = $fid;
- return $written;
- }
-
- public function writeFieldBegin($field_name, $field_type, $field_id) {
- if ($field_type == TTYPE::BOOL) {
- $this->state = TCompactProtocol::STATE_BOOL_WRITE;
- $this->boolFid = $field_id;
- return 0;
- } else {
- $this->state = TCompactProtocol::STATE_VALUE_WRITE;
- return $this->writeFieldHeader(self::$ctypes[$field_type], $field_id);
- }
- }
-
- public function writeFieldEnd() {
- $this->state = TCompactProtocol::STATE_FIELD_WRITE;
- return 0;
- }
-
- public function writeCollectionBegin($etype, $size) {
- $written = 0;
- if ($size <= 14) {
- $written = $this->writeUByte($size << 4 |
- self::$ctypes[$etype]);
- } else {
- $written = $this->writeUByte(0xf0 |
- self::$ctypes[$etype]) +
- $this->writeVarint($size);
- }
- $this->containers[] = $this->state;
- $this->state = TCompactProtocol::STATE_CONTAINER_WRITE;
-
- return $written;
- }
-
- public function writeMapBegin($key_type, $val_type, $size) {
- $written = 0;
- if ($size == 0) {
- $written = $this->writeByte(0);
- } else {
- $written = $this->writeVarint($size) +
- $this->writeUByte(self::$ctypes[$key_type] << 4 |
- self::$ctypes[$val_type]);
- }
- $this->containers[] = $this->state;
- return $written;
- }
-
- public function writeCollectionEnd() {
- $this->state = array_pop($this->containers);
- return 0;
- }
-
- public function writeMapEnd() {
- return $this->writeCollectionEnd();
- }
-
- public function writeListBegin($elem_type, $size) {
- return $this->writeCollectionBegin($elem_type, $size);
- }
-
- public function writeListEnd() {
- return $this->writeCollectionEnd();
- }
-
- public function writeSetBegin($elem_type, $size) {
- return $this->writeCollectionBegin($elem_type, $size);
- }
-
- public function writeSetEnd() {
- return $this->writeCollectionEnd();
- }
-
- public function writeBool($value) {
- if ($this->state == TCompactProtocol::STATE_BOOL_WRITE) {
- $ctype = TCompactProtocol::COMPACT_FALSE;
- if ($value) {
- $ctype = TCompactProtocol::COMPACT_TRUE;
- }
- return $this->writeFieldHeader($ctype, $this->boolFid);
- } else if ($this->state == TCompactProtocol::STATE_CONTAINER_WRITE) {
- return $this->writeByte($value ? 1 : 0);
- } else {
- throw new TProtocolException('Invalid state in compact protocol');
- }
- }
-
- public function writeByte($value) {
- $data = pack('c', $value);
- $this->trans_->write($data, 1);
- return 1;
- }
-
- public function writeUByte($byte) {
- $this->trans_->write(pack('C', $byte), 1);
- return 1;
- }
-
- public function writeI16($value) {
- $thing = $this->toZigZag($value, 16);
- return $this->writeVarint($thing);
- }
-
- public function writeI32($value) {
- $thing = $this->toZigZag($value, 32);
- return $this->writeVarint($thing);
- }
-
- public function writeDouble($value) {
- $data = pack('d', $value);
- $this->trans_->write(strrev($data), 8);
- return 8;
- }
-
- public function writeString($value) {
- $len = TStringFuncFactory::create()->strlen($value);
- $result = $this->writeVarint($len);
- if ($len) {
- $this->trans_->write($value, $len);
- }
- return $result + $len;
- }
-
- public function readFieldBegin(&$name, &$field_type, &$field_id) {
- $result = $this->readUByte($field_type);
-
- if (($field_type & 0x0f) == TType::STOP) {
- $field_id = 0;
- return $result;
- }
- $delta = $field_type >> 4;
- if ($delta == 0) {
- $result += $this->readI16($field_id);
- } else {
- $field_id = $this->lastFid + $delta;
- }
- $this->lastFid = $field_id;
- $field_type = $this->getTType($field_type & 0x0f);
- if ($field_type == TCompactProtocol::COMPACT_TRUE) {
- $this->state = TCompactProtocol::STATE_BOOL_READ;
- $this->boolValue = true;
- } else if ($field_type == TCompactProtocol::COMPACT_FALSE) {
- $this->state = TCompactProtocol::STATE_BOOL_READ;
- $this->boolValue = false;
- } else {
- $this->state = TCompactProtocol::STATE_VALUE_READ;
- }
- return $result;
- }
-
- public function readFieldEnd() {
- $this->state = TCompactProtocol::STATE_FIELD_READ;
- return 0;
- }
-
- public function readUByte(&$value) {
- $data = $this->trans_->readAll(1);
- $arr = unpack('C', $data);
- $value = $arr[1];
- return 1;
- }
-
- public function readByte(&$value) {
- $data = $this->trans_->readAll(1);
- $arr = unpack('c', $data);
- $value = $arr[1];
- return 1;
- }
-
- public function readZigZag(&$value) {
- $result = $this->readVarint($value);
- $value = $this->fromZigZag($value);
- return $result;
- }
-
- public function readMessageBegin(&$name, &$type, &$seqid) {
- $protoId = 0;
- $result = $this->readUByte($protoId);
- if ($protoId != TCompactProtocol::PROTOCOL_ID) {
- throw new TProtocolException('Bad protocol id in TCompact message');
- }
- $verType = 0;
- $result += $this->readUByte($verType);
- $type = ($verType & TCompactProtocol::TYPE_MASK) >>
- TCompactProtocol::TYPE_SHIFT_AMOUNT;
- $version = $verType & TCompactProtocol::VERSION_MASK;
- if ($version != TCompactProtocol::VERSION) {
- throw new TProtocolException('Bad version in TCompact message');
- }
- $result += $this->readVarint($seqId);
- $name += $this->readString($name);
-
- return $result;
- }
-
- public function readMessageEnd() {
- return 0;
- }
-
- public function readStructBegin(&$name) {
- $name = ''; // unused
- $this->structs[] = array($this->state, $this->lastFid);
- $this->state = TCompactProtocol::STATE_FIELD_READ;
- $this->lastFid = 0;
- return 0;
- }
-
- public function readStructEnd() {
- $last = array_pop($this->structs);
- $this->state = $last[0];
- $this->lastFid = $last[1];
- return 0;
- }
-
- public function readCollectionBegin(&$type, &$size) {
- $sizeType = 0;
- $result = $this->readUByte($sizeType);
- $size = $sizeType >> 4;
- $type = $this->getTType($sizeType);
- if ($size == 15) {
- $result += $this->readVarint($size);
- }
- $this->containers[] = $this->state;
- $this->state = TCompactProtocol::STATE_CONTAINER_READ;
-
- return $result;
- }
-
- public function readMapBegin(&$key_type, &$val_type, &$size) {
- $result = $this->readVarint($size);
- $types = 0;
- if ($size > 0) {
- $result += $this->readUByte($types);
- }
- $val_type = $this->getTType($types);
- $key_type = $this->getTType($types >> 4);
- $this->containers[] = $this->state;
- $this->state = TCompactProtocol::STATE_CONTAINER_READ;
-
- return $result;
- }
-
- public function readCollectionEnd() {
- $this->state = array_pop($this->containers);
- return 0;
- }
-
- public function readMapEnd() {
- return $this->readCollectionEnd();
- }
-
- public function readListBegin(&$elem_type, &$size) {
- return $this->readCollectionBegin($elem_type, $size);
- }
-
- public function readListEnd() {
- return $this->readCollectionEnd();
- }
-
- public function readSetBegin(&$elem_type, &$size) {
- return $this->readCollectionBegin($elem_type, $size);
- }
-
- public function readSetEnd() {
- return $this->readCollectionEnd();
- }
-
- public function readBool(&$value) {
- if ($this->state == TCompactProtocol::STATE_BOOL_READ) {
- $value = $this->boolValue;
- return 0;
- } else if ($this->state == TCompactProtocol::STATE_CONTAINER_READ) {
- return $this->readByte($value);
- } else {
- throw new TProtocolException('Invalid state in compact protocol');
- }
- }
-
- public function readI16(&$value) {
- return $this->readZigZag($value);
- }
-
- public function readI32(&$value) {
- return $this->readZigZag($value);
- }
-
- public function readDouble(&$value) {
- $data = strrev($this->trans_->readAll(8));
- $arr = unpack('d', $data);
- $value = $arr[1];
- return 8;
- }
-
- public function readString(&$value) {
- $result = $this->readVarint($len);
- if ($len) {
- $value = $this->trans_->readAll($len);
- } else {
- $value = '';
- }
- return $result + $len;
- }
-
- public function getTType($byte) {
- return self::$ttypes[$byte & 0x0f];
- }
-
- // If we are on a 32bit architecture we have to explicitly deal with
- // 64-bit twos-complement arithmetic since PHP wants to treat all ints
- // as signed and any int over 2^31 - 1 as a float
-
- // Read and write I64 as two 32 bit numbers $hi and $lo
-
- public function readI64(&$value) {
- // Read varint from wire
- $hi = 0;
- $lo = 0;
-
- $idx = 0;
- $shift = 0;
-
- while (true) {
- $x = $this->trans_->readAll(1);
- $arr = unpack('C', $x);
- $byte = $arr[1];
- $idx += 1;
- if ($shift < 32) {
- $lo |= (($byte & 0x7f) << $shift) &
- 0x00000000ffffffff;
- }
- // Shift hi and lo together.
- if ($shift >= 32) {
- $hi |= (($byte & 0x7f) << ($shift - 32));
- } else if ($shift > 25) {
- $hi |= (($byte & 0x7f) >> ($shift - 25));
- }
- if (($byte >> 7) === 0) {
- break;
- }
- $shift += 7;
- }
-
- // Now, unzig it.
- $xorer = 0;
- if ($lo & 1) {
- $xorer = 0xffffffff;
- }
- $lo = ($lo >> 1) & 0x7fffffff;
- $lo = $lo | (($hi & 1) << 31);
- $hi = ($hi >> 1) ^ $xorer;
- $lo = $lo ^ $xorer;
-
- // Now put $hi and $lo back together
- if (true) {
- $isNeg = $hi < 0;
-
- // Check for a negative
- if ($isNeg) {
- $hi = ~$hi & (int)0xffffffff;
- $lo = ~$lo & (int)0xffffffff;
-
- if ($lo == (int)0xffffffff) {
- $hi++;
- $lo = 0;
- } else {
- $lo++;
- }
- }
-
- // Force 32bit words in excess of 2G to be positive - we deal with sign
- // explicitly below
-
- if ($hi & (int)0x80000000) {
- $hi &= (int)0x7fffffff;
- $hi += 0x80000000;
- }
-
- if ($lo & (int)0x80000000) {
- $lo &= (int)0x7fffffff;
- $lo += 0x80000000;
- }
-
- $value = $hi * 4294967296 + $lo;
-
- if ($isNeg) {
- $value = 0 - $value;
- }
- } else {
-
- // Upcast negatives in LSB bit
- if ($arr[2] & 0x80000000) {
- $arr[2] = $arr[2] & 0xffffffff;
- }
-
- // Check for a negative
- if ($arr[1] & 0x80000000) {
- $arr[1] = $arr[1] & 0xffffffff;
- $arr[1] = $arr[1] ^ 0xffffffff;
- $arr[2] = $arr[2] ^ 0xffffffff;
- $value = 0 - $arr[1] * 4294967296 - $arr[2] - 1;
- } else {
- $value = $arr[1] * 4294967296 + $arr[2];
- }
- }
-
- return $idx;
- }
-
- public function writeI64($value) {
- // If we are in an I32 range, use the easy method below.
- if (($value > 4294967296) || ($value < -4294967296)) {
- // Convert $value to $hi and $lo
- $neg = $value < 0;
-
- if ($neg) {
- $value *= -1;
- }
-
- $hi = (int)$value >> 32;
- $lo = (int)$value & 0xffffffff;
-
- if ($neg) {
- $hi = ~$hi;
- $lo = ~$lo;
- if (($lo & (int)0xffffffff) == (int)0xffffffff) {
- $lo = 0;
- $hi++;
- } else {
- $lo++;
- }
- }
-
- // Now do the zigging and zagging.
- $xorer = 0;
- if ($neg) {
- $xorer = 0xffffffff;
- }
- $lowbit = ($lo >> 31) & 1;
- $hi = ($hi << 1) | $lowbit;
- $lo = ($lo << 1);
- $lo = ($lo ^ $xorer) & 0xffffffff;
- $hi = ($hi ^ $xorer) & 0xffffffff;
-
- // now write out the varint, ensuring we shift both hi and lo
- $out = "";
- while (true) {
- if (($lo & ~0x7f) === 0 &&
- $hi === 0) {
- $out .= chr($lo);
- break;
- } else {
- $out .= chr(($lo & 0xff) | 0x80);
- $lo = $lo >> 7;
- $lo = $lo | ($hi << 25);
- $hi = $hi >> 7;
- // Right shift carries sign, but we don't want it to.
- $hi = $hi & (127 << 25);
- }
- }
-
- $ret = TStringFuncFactory::create()->strlen($out);
- $this->trans_->write($out, $ret);
-
- return $ret;
- } else {
- return $this->writeVarint($this->toZigZag($value, 64));
- }
- }
-}
-
-/**
- * Compact Protocol Factory
- */
-class TCompcatProtocolFactory implements TProtocolFactory {
-
- public function __construct() {
- }
-
- public function getProtocol($trans) {
- return new TCompactProtocol($trans);
- }
-}
-
Modified: thrift/trunk/lib/php/src/protocol/TJSONProtocol.php
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/php/src/protocol/TJSONProtocol.php?rev=1381323&r1=1381322&r2=1381323&view=diff
==============================================================================
--- thrift/trunk/lib/php/src/protocol/TJSONProtocol.php (original)
+++ thrift/trunk/lib/php/src/protocol/TJSONProtocol.php Wed Sep 5 19:47:14 2012
@@ -1,808 +0,0 @@
-<?php
-
-/*
- * 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 thrift.protocol
- */
-
-/**
- * JSON implementation of thrift protocol, ported from Java.
- */
-class TJSONProtocol extends TProtocol
-{
- const COMMA = ',';
- const COLON = ':';
- const LBRACE = '{';
- const RBRACE = '}';
- const LBRACKET = '[';
- const RBRACKET = ']';
- const QUOTE = '"';
- const BACKSLASH = '\\';
- const ZERO = '0';
- const ESCSEQ = '\\';
- const DOUBLEESC = '__DOUBLE_ESCAPE_SEQUENCE__';
-
- const VERSION = 1;
-
- public static $JSON_CHAR_TABLE = array(
- /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
- 0, 0, 0, 0, 0, 0, 0, 0, 'b', 't', 'n', 0, 'f', 'r', 0, 0, // 0
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1
- 1, 1, '"', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 2
- );
-
- public static $ESCAPE_CHARS = array('"', '\\', "b", "f", "n", "r", "t");
-
- public static $ESCAPE_CHAR_VALS = array(
- '"', '\\', "\x08", "\f", "\n", "\r", "\t",
- );
-
- const NAME_BOOL = "tf";
- const NAME_BYTE = "i8";
- const NAME_I16 = "i16";
- const NAME_I32 = "i32";
- const NAME_I64 = "i64";
- const NAME_DOUBLE = "dbl";
- const NAME_STRUCT = "rec";
- const NAME_STRING = "str";
- const NAME_MAP = "map";
- const NAME_LIST = "lst";
- const NAME_SET = "set";
-
- private function getTypeNameForTypeID($typeID)
- {
- switch ($typeID) {
- case TType::BOOL:
- return self::NAME_BOOL;
- case TType::BYTE:
- return self::NAME_BYTE;
- case TType::I16:
- return self::NAME_I16;
- case TType::I32:
- return self::NAME_I32;
- case TType::I64:
- return self::NAME_I64;
- case TType::DOUBLE:
- return self::NAME_DOUBLE;
- case TType::STRING:
- return self::NAME_STRING;
- case TType::STRUCT:
- return self::NAME_STRUCT;
- case TType::MAP:
- return self::NAME_MAP;
- case TType::SET:
- return self::NAME_SET;
- case TType::LST:
- return self::NAME_LIST;
- default:
- throw new TProtocolException("Unrecognized type", TProtocolException::UNKNOWN);
- }
- }
-
- private function getTypeIDForTypeName($name)
- {
- $result = TType::STOP;
-
- if (strlen($name) > 1) {
- switch (substr($name, 0, 1)) {
- case 'd':
- $result = TType::DOUBLE;
- break;
- case 'i':
- switch (substr($name, 1, 1)) {
- case '8':
- $result = TType::BYTE;
- break;
- case '1':
- $result = TType::I16;
- break;
- case '3':
- $result = TType::I32;
- break;
- case '6':
- $result = TType::I64;
- break;
- }
- break;
- case 'l':
- $result = TType::LST;
- break;
- case 'm':
- $result = TType::MAP;
- break;
- case 'r':
- $result = TType::STRUCT;
- break;
- case 's':
- if (substr($name, 1, 1) == 't') {
- $result = TType::STRING;
- }
- else if (substr($name, 1, 1) == 'e') {
- $result = TType::SET;
- }
- break;
- case 't':
- $result = TType::BOOL;
- break;
- }
- }
- if ($result == TType::STOP) {
- throw new TProtocolException("Unrecognized type", TProtocolException::INVALID_DATA);
- }
- return $result;
- }
-
- public $contextStack_ = array();
- public $context_;
- public $reader_;
-
- private function pushContext($c) {
- array_push($this->contextStack_, $this->context_);
- $this->context_ = $c;
- }
-
- private function popContext() {
- $this->context_ = array_pop($this->contextStack_);
- }
-
- public function __construct($trans) {
- parent::__construct($trans);
- $this->context_ = new TJSONProtocol_JSONBaseContext();
- $this->reader_ = new TJSONProtocol_LookaheadReader($this);
- }
-
- public function reset() {
- $this->contextStack_ = array();
- $this->context_ = new TJSONProtocol_JSONBaseContext();
- $this->reader_ = new TJSONProtocol_LookaheadReader($this);
- }
-
- private $tmpbuf_ = array(4);
-
- public function readJSONSyntaxChar($b) {
- $ch = $this->reader_->read();
-
- if (substr($ch, 0, 1) != $b) {
- throw new TProtocolException("Unexpected character: " . $ch, TProtocolException::INVALID_DATA);
- }
- }
-
- private function hexVal($s) {
- for ($i = 0; $i < strlen($s); $i++) {
- $ch = substr($s, $i, 1);
-
- if (!($ch >= "a" && $ch <= "f") && !($ch >= "0" && $ch <= "9")) {
- throw new TProtocolException("Expected hex character " . $ch, TProtocolException::INVALID_DATA);
- }
- }
-
- return hexdec($s);
- }
-
- private function hexChar($val) {
- return dechex($val);
- }
-
- private function writeJSONString($b) {
- $this->context_->write();
-
- if (is_numeric($b) && $this->context_->escapeNum()) {
- $this->trans_->write(self::QUOTE);
- }
-
- $this->trans_->write(json_encode($b));
-
- if (is_numeric($b) && $this->context_->escapeNum()) {
- $this->trans_->write(self::QUOTE);
- }
- }
-
- private function writeJSONInteger($num) {
- $this->context_->write();
-
- if ($this->context_->escapeNum()) {
- $this->trans_->write(self::QUOTE);
- }
-
- $this->trans_->write($num);
-
- if ($this->context_->escapeNum()) {
- $this->trans_->write(self::QUOTE);
- }
- }
-
- private function writeJSONDouble($num) {
- $this->context_->write();
-
- if ($this->context_->escapeNum()) {
- $this->trans_->write(self::QUOTE);
- }
-
- $this->trans_->write(json_encode($num));
-
- if ($this->context_->escapeNum()) {
- $this->trans_->write(self::QUOTE);
- }
- }
-
- private function writeJSONBase64($data) {
- $this->context_->write();
- $this->trans_->write(self::QUOTE);
- $this->trans_->write(json_encode(base64_encode($data)));
- $this->trans_->write(self::QUOTE);
- }
-
- private function writeJSONObjectStart() {
- $this->context_->write();
- $this->trans_->write(self::LBRACE);
- $this->pushContext(new TJSONProtocol_JSONPairContext($this));
- }
-
- private function writeJSONObjectEnd() {
- $this->popContext();
- $this->trans_->write(self::RBRACE);
- }
-
- private function writeJSONArrayStart() {
- $this->context_->write();
- $this->trans_->write(self::LBRACKET);
- $this->pushContext(new TJSONProtocol_JSONListContext($this));
- }
-
- private function writeJSONArrayEnd() {
- $this->popContext();
- $this->trans_->write(self::RBRACKET);
- }
-
- private function readJSONString($skipContext) {
- if (!$skipContext) {
- $this->context_->read();
- }
-
- $jsonString = '';
- $lastChar = NULL;
- while (true) {
- $ch = $this->reader_->read();
- $jsonString .= $ch;
- if ($ch == self::QUOTE &&
- $lastChar !== NULL &&
- $lastChar !== self::ESCSEQ) {
- break;
- }
- if ($ch == self::ESCSEQ && $lastChar == self::ESCSEQ) {
- $lastChar = self::DOUBLEESC;
- } else {
- $lastChar = $ch;
- }
- }
- return json_decode($jsonString);
- }
-
- private function isJSONNumeric($b) {
- switch ($b) {
- case '+':
- case '-':
- case '.':
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- case 'E':
- case 'e':
- return true;
- }
- return false;
- }
-
- private function readJSONNumericChars() {
- $strbld = array();
-
- while (true) {
- $ch = $this->reader_->peek();
-
- if (!$this->isJSONNumeric($ch)) {
- break;
- }
-
- $strbld[] = $this->reader_->read();
- }
-
- return implode("", $strbld);
- }
-
- private function readJSONInteger() {
- $this->context_->read();
-
- if ($this->context_->escapeNum()) {
- $this->readJSONSyntaxChar(self::QUOTE);
- }
-
- $str = $this->readJSONNumericChars();
-
- if ($this->context_->escapeNum()) {
- $this->readJSONSyntaxChar(self::QUOTE);
- }
-
- if (!is_numeric($str)) {
- throw new TProtocolException("Invalid data in numeric: " . $str, TProtocolException::INVALID_DATA);
- }
-
- return intval($str);
- }
-
- /**
- * Identical to readJSONInteger but without the final cast.
- * Needed for proper handling of i64 on 32 bit machines. Why a
- * separate function? So we don't have to force the rest of the
- * use cases through the extra conditional.
- */
- private function readJSONIntegerAsString() {
- $this->context_->read();
-
- if ($this->context_->escapeNum()) {
- $this->readJSONSyntaxChar(self::QUOTE);
- }
-
- $str = $this->readJSONNumericChars();
-
- if ($this->context_->escapeNum()) {
- $this->readJSONSyntaxChar(self::QUOTE);
- }
-
- if (!is_numeric($str)) {
- throw new TProtocolException("Invalid data in numeric: " . $str, TProtocolException::INVALID_DATA);
- }
-
- return $str;
- }
-
- private function readJSONDouble() {
- $this->context_->read();
-
- if (substr($this->reader_->peek(), 0, 1) == self::QUOTE) {
- $arr = $this->readJSONString(true);
-
- if ($arr == "NaN") {
- return NAN;
- } else if ($arr == "Infinity") {
- return INF;
- } else if (!$this->context_->escapeNum()) {
- throw new TProtocolException("Numeric data unexpectedly quoted " . $arr,
- TProtocolException::INVALID_DATA);
- }
-
- return floatval($arr);
- } else {
- if ($this->context_->escapeNum()) {
- $this->readJSONSyntaxChar(self::QUOTE);
- }
-
- return floatval($this->readJSONNumericChars());
- }
- }
-
- private function readJSONBase64() {
- $arr = $this->readJSONString(false);
- $data = base64_decode($arr, true);
-
- if ($data === false) {
- throw new TProtocolException("Invalid base64 data " . $arr, TProtocolException::INVALID_DATA);
- }
-
- return $data;
- }
-
- private function readJSONObjectStart() {
- $this->context_->read();
- $this->readJSONSyntaxChar(self::LBRACE);
- $this->pushContext(new TJSONProtocol_JSONPairContext($this));
- }
-
- private function readJSONObjectEnd() {
- $this->readJSONSyntaxChar(self::RBRACE);
- $this->popContext();
- }
-
- private function readJSONArrayStart()
- {
- $this->context_->read();
- $this->readJSONSyntaxChar(self::LBRACKET);
- $this->pushContext(new TJSONProtocol_JSONListContext($this));
- }
-
- private function readJSONArrayEnd() {
- $this->readJSONSyntaxChar(self::RBRACKET);
- $this->popContext();
- }
-
- /**
- * Writes the message header
- *
- * @param string $name Function name
- * @param int $type message type TMessageType::CALL or TMessageType::REPLY
- * @param int $seqid The sequence id of this message
- */
- public function writeMessageBegin($name, $type, $seqid) {
- $this->writeJSONArrayStart();
- $this->writeJSONInteger(self::VERSION);
- $this->writeJSONString($name);
- $this->writeJSONInteger($type);
- $this->writeJSONInteger($seqid);
- }
-
- /**
- * Close the message
- */
- public function writeMessageEnd() {
- $this->writeJSONArrayEnd();
- }
-
- /**
- * Writes a struct header.
- *
- * @param string $name Struct name
- * @throws TException on write error
- * @return int How many bytes written
- */
- public function writeStructBegin($name) {
- $this->writeJSONObjectStart();
- }
-
- /**
- * Close a struct.
- *
- * @throws TException on write error
- * @return int How many bytes written
- */
- public function writeStructEnd() {
- $this->writeJSONObjectEnd();
- }
-
- public function writeFieldBegin($fieldName, $fieldType, $fieldId) {
- $this->writeJSONInteger($fieldId);
- $this->writeJSONObjectStart();
- $this->writeJSONString($this->getTypeNameForTypeID($fieldType));
- }
-
- public function writeFieldEnd() {
- $this->writeJsonObjectEnd();
- }
-
- public function writeFieldStop() {
- }
-
- public function writeMapBegin($keyType, $valType, $size) {
- $this->writeJSONArrayStart();
- $this->writeJSONString($this->getTypeNameForTypeID($keyType));
- $this->writeJSONString($this->getTypeNameForTypeID($valType));
- $this->writeJSONInteger($size);
- $this->writeJSONObjectStart();
- }
-
- public function writeMapEnd() {
- $this->writeJSONObjectEnd();
- $this->writeJSONArrayEnd();
- }
-
- public function writeListBegin($elemType, $size) {
- $this->writeJSONArrayStart();
- $this->writeJSONString($this->getTypeNameForTypeID($elemType));
- $this->writeJSONInteger($size);
- }
-
- public function writeListEnd() {
- $this->writeJSONArrayEnd();
- }
-
- public function writeSetBegin($elemType, $size) {
- $this->writeJSONArrayStart();
- $this->writeJSONString($this->getTypeNameForTypeID($elemType));
- $this->writeJSONInteger($size);
- }
-
- public function writeSetEnd() {
- $this->writeJSONArrayEnd();
- }
-
- public function writeBool($bool) {
- $this->writeJSONInteger($bool ? 1 : 0);
- }
-
- public function writeByte($byte) {
- $this->writeJSONInteger($byte);
- }
-
- public function writeI16($i16) {
- $this->writeJSONInteger($i16);
- }
-
- public function writeI32($i32) {
- $this->writeJSONInteger($i32);
- }
-
- public function writeI64($i64) {
- $this->writeJSONInteger($i64);
- }
-
- public function writeDouble($dub) {
- $this->writeJSONDouble($dub);
- }
-
- public function writeString($str) {
- $this->writeJSONString($str);
- }
-
- /**
- * Reads the message header
- *
- * @param string $name Function name
- * @param int $type message type TMessageType::CALL or TMessageType::REPLY
- * @parem int $seqid The sequence id of this message
- */
- public function readMessageBegin(&$name, &$type, &$seqid) {
- $this->readJSONArrayStart();
-
- if ($this->readJSONInteger() != self::VERSION) {
- throw new TProtocolException("Message contained bad version", TProtocolException::BAD_VERSION);
- }
-
- $name = $this->readJSONString(false);
- $type = $this->readJSONInteger();
- $seqid = $this->readJSONInteger();
-
- return true;
- }
-
- /**
- * Read the close of message
- */
- public function readMessageEnd() {
- $this->readJSONArrayEnd();
- }
-
- public function readStructBegin(&$name) {
- $this->readJSONObjectStart();
- return 0;
- }
-
- public function readStructEnd() {
- $this->readJSONObjectEnd();
- }
-
- public function readFieldBegin(&$name, &$fieldType, &$fieldId) {
- $ch = $this->reader_->peek();
- $name = "";
-
- if (substr($ch, 0, 1) == self::RBRACE) {
- $fieldType = TType::STOP;
- } else {
- $fieldId = $this->readJSONInteger();
- $this->readJSONObjectStart();
- $fieldType = $this->getTypeIDForTypeName($this->readJSONString(false));
- }
- }
-
- public function readFieldEnd() {
- $this->readJSONObjectEnd();
- }
-
- public function readMapBegin(&$keyType, &$valType, &$size) {
- $this->readJSONArrayStart();
- $keyType = $this->getTypeIDForTypeName($this->readJSONString(false));
- $valType = $this->getTypeIDForTypeName($this->readJSONString(false));
- $size = $this->readJSONInteger();
- $this->readJSONObjectStart();
- }
-
- public function readMapEnd() {
- $this->readJSONObjectEnd();
- $this->readJSONArrayEnd();
- }
-
- public function readListBegin(&$elemType, &$size) {
- $this->readJSONArrayStart();
- $elemType = $this->getTypeIDForTypeName($this->readJSONString(false));
- $size = $this->readJSONInteger();
- return true;
- }
-
- public function readListEnd() {
- $this->readJSONArrayEnd();
- }
-
- public function readSetBegin(&$elemType, &$size) {
- $this->readJSONArrayStart();
- $elemType = $this->getTypeIDForTypeName($this->readJSONString(false));
- $size = $this->readJSONInteger();
- return true;
- }
-
- public function readSetEnd() {
- $this->readJSONArrayEnd();
- }
-
- public function readBool(&$bool) {
- $bool = $this->readJSONInteger() == 0 ? false : true;
- return true;
- }
-
- public function readByte(&$byte) {
- $byte = $this->readJSONInteger();
- return true;
- }
-
- public function readI16(&$i16) {
- $i16 = $this->readJSONInteger();
- return true;
- }
-
- public function readI32(&$i32) {
- $i32 = $this->readJSONInteger();
- return true;
- }
-
- public function readI64(&$i64) {
- if ( PHP_INT_SIZE === 4 ) {
- $i64 = $this->readJSONIntegerAsString();
- } else {
- $i64 = $this->readJSONInteger();
- }
- return true;
- }
-
- public function readDouble(&$dub) {
- $dub = $this->readJSONDouble();
- return true;
- }
-
- public function readString(&$str) {
- $str = $this->readJSONString(false);
- return true;
- }
-}
-
-/**
- * JSON Protocol Factory
- */
-class TJSONProtocolFactory implements TProtocolFactory
-{
- public function __construct()
- {
- }
-
- public function getProtocol($trans)
- {
- return new TJSONProtocol($trans);
- }
-}
-
-class TJSONProtocol_JSONBaseContext
-{
- function escapeNum()
- {
- return false;
- }
-
- function write()
- {
- }
-
- function read()
- {
- }
-}
-
-class TJSONProtocol_JSONListContext extends TJSONProtocol_JSONBaseContext
-{
- private $first_ = true;
- private $p_;
-
- public function __construct($p) {
- $this->p_ = $p;
- }
-
- public function write() {
- if ($this->first_) {
- $this->first_ = false;
- } else {
- $this->p_->getTransport()->write(TJSONProtocol::COMMA);
- }
- }
-
- public function read() {
- if ($this->first_) {
- $this->first_ = false;
- } else {
- $this->p_->readJSONSyntaxChar(TJSONProtocol::COMMA);
- }
- }
-}
-
-class TJSONProtocol_JSONPairContext extends TJSONProtocol_JSONBaseContext {
- private $first_ = true;
- private $colon_ = true;
- private $p_ = null;
-
- public function __construct($p) {
- $this->p_ = $p;
- }
-
- public function write() {
- if ($this->first_) {
- $this->first_ = false;
- $this->colon_ = true;
- } else {
- $this->p_->getTransport()->write($this->colon_ ? TJSONProtocol::COLON : TJSONProtocol::COMMA);
- $this->colon_ = !$this->colon_;
- }
- }
-
- public function read() {
- if ($this->first_) {
- $this->first_ = false;
- $this->colon_ = true;
- } else {
- $this->p_->readJSONSyntaxChar($this->colon_ ? TJSONProtocol::COLON : TJSONProtocol::COMMA);
- $this->colon_ = !$this->colon_;
- }
- }
-
- public function escapeNum() {
- return $this->colon_;
- }
-}
-
-class TJSONProtocol_LookaheadReader
-{
- private $hasData_ = false;
- private $data_ = array();
- private $p_;
-
- public function __construct($p)
- {
- $this->p_ = $p;
- }
-
- public function read() {
- if ($this->hasData_) {
- $this->hasData_ = false;
- } else {
- $this->data_ = $this->p_->getTransport()->readAll(1);
- }
-
- return substr($this->data_, 0, 1);
- }
-
- public function peek() {
- if (!$this->hasData_) {
- $this->data_ = $this->p_->getTransport()->readAll(1);
- }
-
- $this->hasData_ = true;
- return substr($this->data_, 0, 1);
- }
-}
-
-
Modified: thrift/trunk/lib/php/src/protocol/TProtocol.php
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/php/src/protocol/TProtocol.php?rev=1381323&r1=1381322&r2=1381323&view=diff
==============================================================================
--- thrift/trunk/lib/php/src/protocol/TProtocol.php (original)
+++ thrift/trunk/lib/php/src/protocol/TProtocol.php Wed Sep 5 19:47:14 2012
@@ -1,376 +0,0 @@
-<?php
-/*
- * 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 thrift.protocol
- */
-
-
-/**
- * Protocol module. Contains all the types and definitions needed to implement
- * a protocol encoder/decoder.
- *
- * @package thrift.protocol
- */
-
-/**
- * Protocol exceptions
- */
-class TProtocolException extends TException {
- const UNKNOWN = 0;
- const INVALID_DATA = 1;
- const NEGATIVE_SIZE = 2;
- const SIZE_LIMIT = 3;
- const BAD_VERSION = 4;
-
- function __construct($message=null, $code=0) {
- parent::__construct($message, $code);
- }
-}
-
-/**
- * Protocol base class module.
- */
-abstract class TProtocol {
- // The below may seem silly, but it is to get around the problem that the
- // "instanceof" operator can only take in a T_VARIABLE and not a T_STRING
- // or T_CONSTANT_ENCAPSED_STRING. Using "is_a()" instead of "instanceof" is
- // a workaround but is deprecated in PHP5. This is used in the generated
- // deserialization code.
- static $TBINARYPROTOCOLACCELERATED = 'TBinaryProtocolAccelerated';
-
- /**
- * Underlying transport
- *
- * @var TTransport
- */
- protected $trans_;
-
- /**
- * Constructor
- */
- protected function __construct($trans) {
- $this->trans_ = $trans;
- }
-
- /**
- * Accessor for transport
- *
- * @return TTransport
- */
- public function getTransport() {
- return $this->trans_;
- }
-
- /**
- * Writes the message header
- *
- * @param string $name Function name
- * @param int $type message type TMessageType::CALL or TMessageType::REPLY
- * @param int $seqid The sequence id of this message
- */
- public abstract function writeMessageBegin($name, $type, $seqid);
-
- /**
- * Close the message
- */
- public abstract function writeMessageEnd();
-
- /**
- * Writes a struct header.
- *
- * @param string $name Struct name
- * @throws TException on write error
- * @return int How many bytes written
- */
- public abstract function writeStructBegin($name);
-
- /**
- * Close a struct.
- *
- * @throws TException on write error
- * @return int How many bytes written
- */
- public abstract function writeStructEnd();
-
- /*
- * Starts a field.
- *
- * @param string $name Field name
- * @param int $type Field type
- * @param int $fid Field id
- * @throws TException on write error
- * @return int How many bytes written
- */
- public abstract function writeFieldBegin($fieldName, $fieldType, $fieldId);
-
- public abstract function writeFieldEnd();
-
- public abstract function writeFieldStop();
-
- public abstract function writeMapBegin($keyType, $valType, $size);
-
- public abstract function writeMapEnd();
-
- public abstract function writeListBegin($elemType, $size);
-
- public abstract function writeListEnd();
-
- public abstract function writeSetBegin($elemType, $size);
-
- public abstract function writeSetEnd();
-
- public abstract function writeBool($bool);
-
- public abstract function writeByte($byte);
-
- public abstract function writeI16($i16);
-
- public abstract function writeI32($i32);
-
- public abstract function writeI64($i64);
-
- public abstract function writeDouble($dub);
-
- public abstract function writeString($str);
-
- /**
- * Reads the message header
- *
- * @param string $name Function name
- * @param int $type message type TMessageType::CALL or TMessageType::REPLY
- * @parem int $seqid The sequence id of this message
- */
- public abstract function readMessageBegin(&$name, &$type, &$seqid);
-
- /**
- * Read the close of message
- */
- public abstract function readMessageEnd();
-
- public abstract function readStructBegin(&$name);
-
- public abstract function readStructEnd();
-
- public abstract function readFieldBegin(&$name, &$fieldType, &$fieldId);
-
- public abstract function readFieldEnd();
-
- public abstract function readMapBegin(&$keyType, &$valType, &$size);
-
- public abstract function readMapEnd();
-
- public abstract function readListBegin(&$elemType, &$size);
-
- public abstract function readListEnd();
-
- public abstract function readSetBegin(&$elemType, &$size);
-
- public abstract function readSetEnd();
-
- public abstract function readBool(&$bool);
-
- public abstract function readByte(&$byte);
-
- public abstract function readI16(&$i16);
-
- public abstract function readI32(&$i32);
-
- public abstract function readI64(&$i64);
-
- public abstract function readDouble(&$dub);
-
- public abstract function readString(&$str);
-
- /**
- * The skip function is a utility to parse over unrecognized date without
- * causing corruption.
- *
- * @param TType $type What type is it
- */
- public function skip($type) {
- switch ($type) {
- case TType::BOOL:
- return $this->readBool($bool);
- case TType::BYTE:
- return $this->readByte($byte);
- case TType::I16:
- return $this->readI16($i16);
- case TType::I32:
- return $this->readI32($i32);
- case TType::I64:
- return $this->readI64($i64);
- case TType::DOUBLE:
- return $this->readDouble($dub);
- case TType::STRING:
- return $this->readString($str);
- case TType::STRUCT:
- {
- $result = $this->readStructBegin($name);
- while (true) {
- $result += $this->readFieldBegin($name, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- $result += $this->skip($ftype);
- $result += $this->readFieldEnd();
- }
- $result += $this->readStructEnd();
- return $result;
- }
- case TType::MAP:
- {
- $result = $this->readMapBegin($keyType, $valType, $size);
- for ($i = 0; $i < $size; $i++) {
- $result += $this->skip($keyType);
- $result += $this->skip($valType);
- }
- $result += $this->readMapEnd();
- return $result;
- }
- case TType::SET:
- {
- $result = $this->readSetBegin($elemType, $size);
- for ($i = 0; $i < $size; $i++) {
- $result += $this->skip($elemType);
- }
- $result += $this->readSetEnd();
- return $result;
- }
- case TType::LST:
- {
- $result = $this->readListBegin($elemType, $size);
- for ($i = 0; $i < $size; $i++) {
- $result += $this->skip($elemType);
- }
- $result += $this->readListEnd();
- return $result;
- }
- default:
- throw new TProtocolException('Unknown field type: '.$type,
- TProtocolException::INVALID_DATA);
- }
- }
-
- /**
- * Utility for skipping binary data
- *
- * @param TTransport $itrans TTransport object
- * @param int $type Field type
- */
- public static function skipBinary($itrans, $type) {
- switch ($type) {
- case TType::BOOL:
- return $itrans->readAll(1);
- case TType::BYTE:
- return $itrans->readAll(1);
- case TType::I16:
- return $itrans->readAll(2);
- case TType::I32:
- return $itrans->readAll(4);
- case TType::I64:
- return $itrans->readAll(8);
- case TType::DOUBLE:
- return $itrans->readAll(8);
- case TType::STRING:
- $len = unpack('N', $itrans->readAll(4));
- $len = $len[1];
- if ($len > 0x7fffffff) {
- $len = 0 - (($len - 1) ^ 0xffffffff);
- }
- return 4 + $itrans->readAll($len);
- case TType::STRUCT:
- {
- $result = 0;
- while (true) {
- $ftype = 0;
- $fid = 0;
- $data = $itrans->readAll(1);
- $arr = unpack('c', $data);
- $ftype = $arr[1];
- if ($ftype == TType::STOP) {
- break;
- }
- // I16 field id
- $result += $itrans->readAll(2);
- $result += self::skipBinary($itrans, $ftype);
- }
- return $result;
- }
- case TType::MAP:
- {
- // Ktype
- $data = $itrans->readAll(1);
- $arr = unpack('c', $data);
- $ktype = $arr[1];
- // Vtype
- $data = $itrans->readAll(1);
- $arr = unpack('c', $data);
- $vtype = $arr[1];
- // Size
- $data = $itrans->readAll(4);
- $arr = unpack('N', $data);
- $size = $arr[1];
- if ($size > 0x7fffffff) {
- $size = 0 - (($size - 1) ^ 0xffffffff);
- }
- $result = 6;
- for ($i = 0; $i < $size; $i++) {
- $result += self::skipBinary($itrans, $ktype);
- $result += self::skipBinary($itrans, $vtype);
- }
- return $result;
- }
- case TType::SET:
- case TType::LST:
- {
- // Vtype
- $data = $itrans->readAll(1);
- $arr = unpack('c', $data);
- $vtype = $arr[1];
- // Size
- $data = $itrans->readAll(4);
- $arr = unpack('N', $data);
- $size = $arr[1];
- if ($size > 0x7fffffff) {
- $size = 0 - (($size - 1) ^ 0xffffffff);
- }
- $result = 5;
- for ($i = 0; $i < $size; $i++) {
- $result += self::skipBinary($itrans, $vtype);
- }
- return $result;
- }
- default:
- throw new TProtocolException('Unknown field type: '.$type,
- TProtocolException::INVALID_DATA);
- }
- }
-}
-
-/**
- * Protocol factory creates protocol objects from transports
- */
-interface TProtocolFactory {
- /**
- * Build a protocol from the base transport
- *
- * @return TProtocol protocol
- */
- public function getProtocol($trans);
-}
Modified: thrift/trunk/lib/php/src/server/TForkingServer.php
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/php/src/server/TForkingServer.php?rev=1381323&r1=1381322&r2=1381323&view=diff
==============================================================================
--- thrift/trunk/lib/php/src/server/TForkingServer.php (original)
+++ thrift/trunk/lib/php/src/server/TForkingServer.php Wed Sep 5 19:47:14 2012
@@ -1,114 +0,0 @@
-<?php
-
-include_once $GLOBALS['THRIFT_ROOT'].'/server/TServer.php';
-
-/**
- * A forking implementation of a Thrift server.
- *
- * @package thrift.server
- */
-class TForkingServer extends TServer {
- /**
- * Flag for the main serving loop
- *
- * @var bool
- */
- private $stop_ = false;
-
- /**
- * List of children.
- *
- * @var array
- */
- protected $children_ = array();
-
- /**
- * Listens for new client using the supplied
- * transport. We fork when a new connection
- * arrives.
- *
- * @return void
- */
- public function serve() {
- $this->transport_->listen();
-
- while (!$this->stop_) {
- try {
- $transport = $this->transport_->accept();
-
- if ($transport != null) {
- $pid = pcntl_fork();
-
- if ($pid > 0) {
- $this->handleParent($transport, $pid);
- }
- else if ($pid === 0) {
- $this->handleChild($transport);
- }
- else {
- throw new TException('Failed to fork');
- }
- }
- }
- catch (TTransportException $e) { }
-
- $this->collectChildren();
- }
- }
-
- /**
- * Code run by the parent
- *
- * @param TTransport $transport
- * @param int $pid
- * @return void
- */
- private function handleParent(TTransport $transport, $pid) {
- $this->children_[$pid] = $transport;
- }
-
- /**
- * Code run by the child.
- *
- * @param TTransport $transport
- * @return void
- */
- private function handleChild(TTransport $transport) {
- try {
- $inputTransport = $this->inputTransportFactory_->getTransport($transport);
- $outputTransport = $this->outputTransportFactory_->getTransport($transport);
- $inputProtocol = $this->inputProtocolFactory_->getProtocol($inputTransport);
- $outputProtocol = $this->outputProtocolFactory_->getProtocol($outputTransport);
- while ($this->processor_->process($inputProtocol, $outputProtocol)) { }
- @$transport->close();
- }
- catch (TTransportException $e) { }
-
- exit(0);
- }
-
- /**
- * Collects any children we may have
- *
- * @return void
- */
- private function collectChildren() {
- foreach ($this->children_ as $pid => $transport) {
- if (pcntl_waitpid($pid, $status, WNOHANG) > 0) {
- unset($this->children_[$pid]);
- if ($transport) @$transport->close();
- }
- }
- }
-
- /**
- * Stops the server running. Kills the transport
- * and then stops the main serving loop
- *
- * @return void
- */
- public function stop() {
- $this->transport_->close();
- $this->stop_ = true;
- }
-}
Modified: thrift/trunk/lib/php/src/server/TServer.php
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/php/src/server/TServer.php?rev=1381323&r1=1381322&r2=1381323&view=diff
==============================================================================
--- thrift/trunk/lib/php/src/server/TServer.php (original)
+++ thrift/trunk/lib/php/src/server/TServer.php Wed Sep 5 19:47:14 2012
@@ -1,95 +0,0 @@
-<?php
-
-/**
- * Generic class for a Thrift server.
- *
- * @package thrift.server
- */
-abstract class TServer {
-
- /**
- * Processor to handle new clients
- *
- * @var TProcessor
- */
- protected $processor_;
-
- /**
- * Server transport to be used for listening
- * and accepting new clients
- *
- * @var TServerTransport
- */
- protected $transport_;
-
- /**
- * Input transport factory
- *
- * @var TTransportFactory
- */
- protected $inputTransportFactory_;
-
- /**
- * Output transport factory
- *
- * @var TTransportFactory
- */
- protected $outputTransportFactory_;
-
- /**
- * Input protocol factory
- *
- * @var TProtocolFactory
- */
- protected $inputProtocolFactory_;
-
- /**
- * Output protocol factory
- *
- * @var TProtocolFactory
- */
- protected $outputProtocolFactory_;
-
- /**
- * Sets up all the factories, etc
- *
- * @param object $processor
- * @param TServerTransport $transport
- * @param TTransportFactory $inputTransportFactory
- * @param TTransportFactory $outputTransportFactory
- * @param TProtocolFactory $inputProtocolFactory
- * @param TProtocolFactory $outputProtocolFactory
- * @return void
- */
- public function __construct($processor,
- TServerTransport $transport,
- TTransportFactory $inputTransportFactory,
- TTransportFactory $outputTransportFactory,
- TProtocolFactory $inputProtocolFactory,
- TProtocolFactory $outputProtocolFactory) {
- $this->processor_ = $processor;
- $this->transport_ = $transport;
- $this->inputTransportFactory_ = $inputTransportFactory;
- $this->outputTransportFactory_ = $outputTransportFactory;
- $this->inputProtocolFactory_ = $inputProtocolFactory;
- $this->outputProtocolFactory_ = $outputProtocolFactory;
- }
-
- /**
- * Serves the server. This should never return
- * unless a problem permits it to do so or it
- * is interrupted intentionally
- *
- * @abstract
- * @return void
- */
- abstract public function serve();
-
- /**
- * Stops the server serving
- *
- * @abstract
- * @return void
- */
- abstract public function stop();
-}
Modified: thrift/trunk/lib/php/src/server/TSimpleServer.php
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/php/src/server/TSimpleServer.php?rev=1381323&r1=1381322&r2=1381323&view=diff
==============================================================================
--- thrift/trunk/lib/php/src/server/TSimpleServer.php (original)
+++ thrift/trunk/lib/php/src/server/TSimpleServer.php Wed Sep 5 19:47:14 2012
@@ -1,54 +0,0 @@
-<?php
-
-include_once $GLOBALS['THRIFT_ROOT'].'/server/TServer.php';
-
-/**
- * Simple implemtation of a Thrift server.
- *
- * @package thrift.server
- */
-class TSimpleServer extends TServer {
- /**
- * Flag for the main serving loop
- *
- * @var bool
- */
- private $stop_ = false;
-
- /**
- * Listens for new client using the supplied
- * transport. It handles TTransportExceptions
- * to avoid timeouts etc killing it
- *
- * @return void
- */
- public function serve() {
- $this->transport_->listen();
-
- while (!$this->stop_) {
- try {
- $transport = $this->transport_->accept();
-
- if ($transport != null) {
- $inputTransport = $this->inputTransportFactory_->getTransport($transport);
- $outputTransport = $this->outputTransportFactory_->getTransport($transport);
- $inputProtocol = $this->inputProtocolFactory_->getProtocol($inputTransport);
- $outputProtocol = $this->outputProtocolFactory_->getProtocol($outputTransport);
- while ($this->processor_->process($inputProtocol, $outputProtocol)) { }
- }
- }
- catch (TTransportException $e) { }
- }
- }
-
- /**
- * Stops the server running. Kills the transport
- * and then stops the main serving loop
- *
- * @return void
- */
- public function stop() {
- $this->transport_->close();
- $this->stop_ = true;
- }
-}
Modified: thrift/trunk/lib/php/src/transport/TBufferedTransport.php
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/php/src/transport/TBufferedTransport.php?rev=1381323&r1=1381322&r2=1381323&view=diff
==============================================================================
--- thrift/trunk/lib/php/src/transport/TBufferedTransport.php (original)
+++ thrift/trunk/lib/php/src/transport/TBufferedTransport.php Wed Sep 5 19:47:14 2012
@@ -1,161 +0,0 @@
-<?php
-/*
- * 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 thrift.transport
- */
-
-
-/**
- * Buffered transport. Stores data to an internal buffer that it doesn't
- * actually write out until flush is called. For reading, we do a greedy
- * read and then serve data out of the internal buffer.
- *
- * @package thrift.transport
- */
-class TBufferedTransport extends TTransport {
-
- /**
- * Constructor. Creates a buffered transport around an underlying transport
- */
- public function __construct($transport=null, $rBufSize=512, $wBufSize=512) {
- $this->transport_ = $transport;
- $this->rBufSize_ = $rBufSize;
- $this->wBufSize_ = $wBufSize;
- }
-
- /**
- * The underlying transport
- *
- * @var TTransport
- */
- protected $transport_ = null;
-
- /**
- * The receive buffer size
- *
- * @var int
- */
- protected $rBufSize_ = 512;
-
- /**
- * The write buffer size
- *
- * @var int
- */
- protected $wBufSize_ = 512;
-
- /**
- * The write buffer.
- *
- * @var string
- */
- protected $wBuf_ = '';
-
- /**
- * The read buffer.
- *
- * @var string
- */
- protected $rBuf_ = '';
-
- public function isOpen() {
- return $this->transport_->isOpen();
- }
-
- public function open() {
- $this->transport_->open();
- }
-
- public function close() {
- $this->transport_->close();
- }
-
- public function putBack($data) {
- if (TStringFuncFactory::create()->strlen($this->rBuf_) === 0) {
- $this->rBuf_ = $data;
- } else {
- $this->rBuf_ = ($data . $this->rBuf_);
- }
- }
-
- /**
- * The reason that we customize readAll here is that the majority of PHP
- * streams are already internally buffered by PHP. The socket stream, for
- * example, buffers internally and blocks if you call read with $len greater
- * than the amount of data available, unlike recv() in C.
- *
- * Therefore, use the readAll method of the wrapped transport inside
- * the buffered readAll.
- */
- public function readAll($len) {
- $have = TStringFuncFactory::create()->strlen($this->rBuf_);
- if ($have == 0) {
- $data = $this->transport_->readAll($len);
- } else if ($have < $len) {
- $data = $this->rBuf_;
- $this->rBuf_ = '';
- $data .= $this->transport_->readAll($len - $have);
- } else if ($have == $len) {
- $data = $this->rBuf_;
- $this->rBuf_ = '';
- } else if ($have > $len) {
- $data = TStringFuncFactory::create()->substr($this->rBuf_, 0, $len);
- $this->rBuf_ = TStringFuncFactory::create()->substr($this->rBuf_, $len);
- }
- return $data;
- }
-
- public function read($len) {
- if (TStringFuncFactory::create()->strlen($this->rBuf_) === 0) {
- $this->rBuf_ = $this->transport_->read($this->rBufSize_);
- }
-
- if (TStringFuncFactory::create()->strlen($this->rBuf_) <= $len) {
- $ret = $this->rBuf_;
- $this->rBuf_ = '';
- return $ret;
- }
-
- $ret = TStringFuncFactory::create()->substr($this->rBuf_, 0, $len);
- $this->rBuf_ = TStringFuncFactory::create()->substr($this->rBuf_, $len);
- return $ret;
- }
-
- public function write($buf) {
- $this->wBuf_ .= $buf;
- if (TStringFuncFactory::create()->strlen($this->wBuf_) >= $this->wBufSize_) {
- $out = $this->wBuf_;
-
- // Note that we clear the internal wBuf_ prior to the underlying write
- // to ensure we're in a sane state (i.e. internal buffer cleaned)
- // if the underlying write throws up an exception
- $this->wBuf_ = '';
- $this->transport_->write($out);
- }
- }
-
- public function flush() {
- if (TStringFuncFactory::create()->strlen($this->wBuf_) > 0) {
- $this->transport_->write($this->wBuf_);
- $this->wBuf_ = '';
- }
- $this->transport_->flush();
- }
-
-}
Modified: thrift/trunk/lib/php/src/transport/TFramedTransport.php
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/php/src/transport/TFramedTransport.php?rev=1381323&r1=1381322&r2=1381323&view=diff
==============================================================================
--- thrift/trunk/lib/php/src/transport/TFramedTransport.php (original)
+++ thrift/trunk/lib/php/src/transport/TFramedTransport.php Wed Sep 5 19:47:14 2012
@@ -1,179 +0,0 @@
-<?php
-/*
- * 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 thrift.transport
- */
-
-
-/**
- * Framed transport. Writes and reads data in chunks that are stamped with
- * their length.
- *
- * @package thrift.transport
- */
-class TFramedTransport extends TTransport {
-
- /**
- * Underlying transport object.
- *
- * @var TTransport
- */
- private $transport_;
-
- /**
- * Buffer for read data.
- *
- * @var string
- */
- private $rBuf_;
-
- /**
- * Buffer for queued output data
- *
- * @var string
- */
- private $wBuf_;
-
- /**
- * Whether to frame reads
- *
- * @var bool
- */
- private $read_;
-
- /**
- * Whether to frame writes
- *
- * @var bool
- */
- private $write_;
-
- /**
- * Constructor.
- *
- * @param TTransport $transport Underlying transport
- */
- public function __construct($transport=null, $read=true, $write=true) {
- $this->transport_ = $transport;
- $this->read_ = $read;
- $this->write_ = $write;
- }
-
- public function isOpen() {
- return $this->transport_->isOpen();
- }
-
- public function open() {
- $this->transport_->open();
- }
-
- public function close() {
- $this->transport_->close();
- }
-
- /**
- * Reads from the buffer. When more data is required reads another entire
- * chunk and serves future reads out of that.
- *
- * @param int $len How much data
- */
- public function read($len) {
- if (!$this->read_) {
- return $this->transport_->read($len);
- }
-
- if (TStringFuncFactory::create()->strlen($this->rBuf_) === 0) {
- $this->readFrame();
- }
-
- // Just return full buff
- if ($len >= TStringFuncFactory::create()->strlen($this->rBuf_)) {
- $out = $this->rBuf_;
- $this->rBuf_ = null;
- return $out;
- }
-
- // Return TStringFuncFactory::create()->substr
- $out = TStringFuncFactory::create()->substr($this->rBuf_, 0, $len);
- $this->rBuf_ = TStringFuncFactory::create()->substr($this->rBuf_, $len);
- return $out;
- }
-
- /**
- * Put previously read data back into the buffer
- *
- * @param string $data data to return
- */
- public function putBack($data) {
- if (TStringFuncFactory::create()->strlen($this->rBuf_) === 0) {
- $this->rBuf_ = $data;
- } else {
- $this->rBuf_ = ($data . $this->rBuf_);
- }
- }
-
- /**
- * Reads a chunk of data into the internal read buffer.
- */
- private function readFrame() {
- $buf = $this->transport_->readAll(4);
- $val = unpack('N', $buf);
- $sz = $val[1];
-
- $this->rBuf_ = $this->transport_->readAll($sz);
- }
-
- /**
- * Writes some data to the pending output buffer.
- *
- * @param string $buf The data
- * @param int $len Limit of bytes to write
- */
- public function write($buf, $len=null) {
- if (!$this->write_) {
- return $this->transport_->write($buf, $len);
- }
-
- if ($len !== null && $len < TStringFuncFactory::create()->strlen($buf)) {
- $buf = TStringFuncFactory::create()->substr($buf, 0, $len);
- }
- $this->wBuf_ .= $buf;
- }
-
- /**
- * Writes the output buffer to the stream in the format of a 4-byte length
- * followed by the actual data.
- */
- public function flush() {
- if (!$this->write_ || TStringFuncFactory::create()->strlen($this->wBuf_) == 0) {
- return $this->transport_->flush();
- }
-
- $out = pack('N', TStringFuncFactory::create()->strlen($this->wBuf_));
- $out .= $this->wBuf_;
-
- // Note that we clear the internal wBuf_ prior to the underlying write
- // to ensure we're in a sane state (i.e. internal buffer cleaned)
- // if the underlying write throws up an exception
- $this->wBuf_ = '';
- $this->transport_->write($out);
- $this->transport_->flush();
- }
-
-}
Modified: thrift/trunk/lib/php/src/transport/THttpClient.php
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/php/src/transport/THttpClient.php?rev=1381323&r1=1381322&r2=1381323&view=diff
==============================================================================
--- thrift/trunk/lib/php/src/transport/THttpClient.php (original)
+++ thrift/trunk/lib/php/src/transport/THttpClient.php Wed Sep 5 19:47:14 2012
@@ -1,200 +0,0 @@
-<?php
-/*
- * 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 thrift.transport
- */
-
-
-/**
- * HTTP client for Thrift
- *
- * @package thrift.transport
- */
-class THttpClient extends TTransport {
-
- /**
- * The host to connect to
- *
- * @var string
- */
- protected $host_;
-
- /**
- * The port to connect on
- *
- * @var int
- */
- protected $port_;
-
- /**
- * The URI to request
- *
- * @var string
- */
- protected $uri_;
-
- /**
- * The scheme to use for the request, i.e. http, https
- *
- * @var string
- */
- protected $scheme_;
-
- /**
- * Buffer for the HTTP request data
- *
- * @var string
- */
- protected $buf_;
-
- /**
- * Input socket stream.
- *
- * @var resource
- */
- protected $handle_;
-
- /**
- * Read timeout
- *
- * @var float
- */
- protected $timeout_;
-
- /**
- * Make a new HTTP client.
- *
- * @param string $host
- * @param int $port
- * @param string $uri
- */
- public function __construct($host, $port=80, $uri='', $scheme = 'http') {
- if ((TStringFuncFactory::create()->strlen($uri) > 0) && ($uri{0} != '/')) {
- $uri = '/'.$uri;
- }
- $this->scheme_ = $scheme;
- $this->host_ = $host;
- $this->port_ = $port;
- $this->uri_ = $uri;
- $this->buf_ = '';
- $this->handle_ = null;
- $this->timeout_ = null;
- }
-
- /**
- * Set read timeout
- *
- * @param float $timeout
- */
- public function setTimeoutSecs($timeout) {
- $this->timeout_ = $timeout;
- }
-
- /**
- * Whether this transport is open.
- *
- * @return boolean true if open
- */
- public function isOpen() {
- return true;
- }
-
- /**
- * Open the transport for reading/writing
- *
- * @throws TTransportException if cannot open
- */
- public function open() {}
-
- /**
- * Close the transport.
- */
- public function close() {
- if ($this->handle_) {
- @fclose($this->handle_);
- $this->handle_ = null;
- }
- }
-
- /**
- * Read some data into the array.
- *
- * @param int $len How much to read
- * @return string The data that has been read
- * @throws TTransportException if cannot read any more data
- */
- public function read($len) {
- $data = @fread($this->handle_, $len);
- if ($data === FALSE || $data === '') {
- $md = stream_get_meta_data($this->handle_);
- if ($md['timed_out']) {
- throw new TTransportException('THttpClient: timed out reading '.$len.' bytes from '.$this->host_.':'.$this->port_.$this->uri_, TTransportException::TIMED_OUT);
- } else {
- throw new TTransportException('THttpClient: Could not read '.$len.' bytes from '.$this->host_.':'.$this->port_.$this->uri_, TTransportException::UNKNOWN);
- }
- }
- return $data;
- }
-
- /**
- * Writes some data into the pending buffer
- *
- * @param string $buf The data to write
- * @throws TTransportException if writing fails
- */
- public function write($buf) {
- $this->buf_ .= $buf;
- }
-
- /**
- * Opens and sends the actual request over the HTTP connection
- *
- * @throws TTransportException if a writing error occurs
- */
- public function flush() {
- // God, PHP really has some esoteric ways of doing simple things.
- $host = $this->host_.($this->port_ != 80 ? ':'.$this->port_ : '');
-
- $headers = array('Host: '.$host,
- 'Accept: application/x-thrift',
- 'User-Agent: PHP/THttpClient',
- 'Content-Type: application/x-thrift',
- 'Content-Length: '.TStringFuncFactory::create()->strlen($this->buf_));
-
- $options = array('method' => 'POST',
- 'header' => implode("\r\n", $headers),
- 'max_redirects' => 1,
- 'content' => $this->buf_);
- if ($this->timeout_ > 0) {
- $options['timeout'] = $this->timeout_;
- }
- $this->buf_ = '';
-
- $contextid = stream_context_create(array('http' => $options));
- $this->handle_ = @fopen($this->scheme_.'://'.$host.$this->uri_, 'r', false, $contextid);
-
- // Connect failed?
- if ($this->handle_ === FALSE) {
- $this->handle_ = null;
- $error = 'THttpClient: Could not connect to '.$host.$this->uri_;
- throw new TTransportException($error, TTransportException::NOT_OPEN);
- }
- }
-
-}
Modified: thrift/trunk/lib/php/src/transport/TMemoryBuffer.php
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/php/src/transport/TMemoryBuffer.php?rev=1381323&r1=1381322&r2=1381323&view=diff
==============================================================================
--- thrift/trunk/lib/php/src/transport/TMemoryBuffer.php (original)
+++ thrift/trunk/lib/php/src/transport/TMemoryBuffer.php Wed Sep 5 19:47:14 2012
@@ -1,82 +0,0 @@
-<?php
-/*
- * 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 thrift.transport
- */
-
-
-/**
- * A memory buffer is a tranpsort that simply reads from and writes to an
- * in-memory string buffer. Anytime you call write on it, the data is simply
- * placed into a buffer, and anytime you call read, data is read from that
- * buffer.
- *
- * @package thrift.transport
- */
-class TMemoryBuffer extends TTransport {
-
- /**
- * Constructor. Optionally pass an initial value
- * for the buffer.
- */
- public function __construct($buf = '') {
- $this->buf_ = $buf;
- }
-
- protected $buf_ = '';
-
- public function isOpen() {
- return true;
- }
-
- public function open() {}
-
- public function close() {}
-
- public function write($buf) {
- $this->buf_ .= $buf;
- }
-
- public function read($len) {
- if (TStringFuncFactory::create()->strlen($this->buf_) === 0) {
- throw new TTransportException('TMemoryBuffer: Could not read ' .
- $len . ' bytes from buffer.',
- TTransportException::UNKNOWN);
- }
-
- if (TStringFuncFactory::create()->strlen($this->buf_) <= $len) {
- $ret = $this->buf_;
- $this->buf_ = '';
- return $ret;
- }
-
- $ret = TStringFuncFactory::create()->substr($this->buf_, 0, $len);
- $this->buf_ = TStringFuncFactory::create()->substr($this->buf_, $len);
-
- return $ret;
- }
-
- function getBuffer() {
- return $this->buf_;
- }
-
- public function available() {
- return TStringFuncFactory::create()->strlen($this->buf_);
- }
-}
Modified: thrift/trunk/lib/php/src/transport/TNullTransport.php
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/php/src/transport/TNullTransport.php?rev=1381323&r1=1381322&r2=1381323&view=diff
==============================================================================
--- thrift/trunk/lib/php/src/transport/TNullTransport.php (original)
+++ thrift/trunk/lib/php/src/transport/TNullTransport.php Wed Sep 5 19:47:14 2012
@@ -1,46 +0,0 @@
-<?php
-/*
- * 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 thrift.transport
- */
-
-
-/**
- * Transport that only accepts writes and ignores them.
- * This is useful for measuring the serialized size of structures.
- *
- * @package thrift.transport
- */
-class TNullTransport extends TTransport {
-
- public function isOpen() {
- return true;
- }
-
- public function open() {}
-
- public function close() {}
-
- public function read($len) {
- throw new TTransportException("Can't read from TNullTransport.");
- }
-
- public function write($buf) {}
-
-}
Modified: thrift/trunk/lib/php/src/transport/TPhpStream.php
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/php/src/transport/TPhpStream.php?rev=1381323&r1=1381322&r2=1381323&view=diff
==============================================================================
--- thrift/trunk/lib/php/src/transport/TPhpStream.php (original)
+++ thrift/trunk/lib/php/src/transport/TPhpStream.php Wed Sep 5 19:47:14 2012
@@ -1,109 +0,0 @@
-<?php
-/*
- * 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 thrift.transport
- */
-
-
-/**
- * Php stream transport. Reads to and writes from the php standard streams
- * php://input and php://output
- *
- * @package thrift.transport
- */
-class TPhpStream extends TTransport {
-
- const MODE_R = 1;
- const MODE_W = 2;
-
- private $inStream_ = null;
-
- private $outStream_ = null;
-
- private $read_ = false;
-
- private $write_ = false;
-
- public function __construct($mode) {
- $this->read_ = $mode & self::MODE_R;
- $this->write_ = $mode & self::MODE_W;
- }
-
- public function open() {
- if ($this->read_) {
- $this->inStream_ = @fopen(self::inStreamName(), 'r');
- if (!is_resource($this->inStream_)) {
- throw new TException('TPhpStream: Could not open php://input');
- }
- }
- if ($this->write_) {
- $this->outStream_ = @fopen('php://output', 'w');
- if (!is_resource($this->outStream_)) {
- throw new TException('TPhpStream: Could not open php://output');
- }
- }
- }
-
- public function close() {
- if ($this->read_) {
- @fclose($this->inStream_);
- $this->inStream_ = null;
- }
- if ($this->write_) {
- @fclose($this->outStream_);
- $this->outStream_ = null;
- }
- }
-
- public function isOpen() {
- return
- (!$this->read_ || is_resource($this->inStream_)) &&
- (!$this->write_ || is_resource($this->outStream_));
- }
-
- public function read($len) {
- $data = @fread($this->inStream_, $len);
- if ($data === FALSE || $data === '') {
- throw new TException('TPhpStream: Could not read '.$len.' bytes');
- }
- return $data;
- }
-
- public function write($buf) {
- while (TStringFuncFactory::create()->strlen($buf) > 0) {
- $got = @fwrite($this->outStream_, $buf);
- if ($got === 0 || $got === FALSE) {
- throw new TException('TPhpStream: Could not write '.TStringFuncFactory::create()->strlen($buf).' bytes');
- }
- $buf = TStringFuncFactory::create()->substr($buf, $got);
- }
- }
-
- public function flush() {
- @fflush($this->outStream_);
- }
-
- private static function inStreamName() {
- if (php_sapi_name() == 'cli') {
- return 'php://stdin';
- }
- return 'php://input';
- }
-
-}
Modified: thrift/trunk/lib/php/src/transport/TServerSocket.php
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/php/src/transport/TServerSocket.php?rev=1381323&r1=1381322&r2=1381323&view=diff
==============================================================================
--- thrift/trunk/lib/php/src/transport/TServerSocket.php (original)
+++ thrift/trunk/lib/php/src/transport/TServerSocket.php Wed Sep 5 19:47:14 2012
@@ -1,96 +0,0 @@
-<?php
-
-include_once $GLOBALS['THRIFT_ROOT'].'/transport/TServerTransport.php';
-include_once $GLOBALS['THRIFT_ROOT'].'/transport/TSocket.php';
-
-/**
- * Socket implementation of a server agent.
- *
- * @package thrift.transport
- */
-class TServerSocket extends TServerTransport {
-
- /**
- * Handle for the listener socket
- *
- * @var resource
- */
- private $listener_;
-
- /**
- * Port for the listener to listen on
- *
- * @var int
- */
- private $port_;
-
- /**
- * Timeout when listening for a new client
- *
- * @var int
- */
- private $acceptTimeout_ = 30000;
-
- /**
- * Host to listen on
- *
- * @var string
- */
- private $host_;
-
- /**
- * ServerSocket constructor
- *
- * @param string $host Host to listen on
- * @param int $port Port to listen on
- * @return void
- */
- public function __construct($host = 'localhost', $port = 9090) {
- $this->host_ = $host;
- $this->port_ = $port;
- }
-
- /**
- * Sets the accept timeout
- *
- * @param int $acceptTimeout
- * @return void
- */
- public function setAcceptTimeout($acceptTimeout) {
- $this->acceptTimeout_ = $acceptTimeout;
- }
-
- /**
- * Opens a new socket server handle
- *
- * @return void
- */
- public function listen() {
- $this->listener_ = stream_socket_server('tcp://' . $this->host_ . ':' . $this->port_);
- }
-
- /**
- * Closes the socket server handle
- *
- * @return void
- */
- public function close() {
- @fclose($this->listener_);
- $this->listener_ = null;
- }
-
- /**
- * Implementation of accept. If not client is accepted in the given time
- *
- * @return TSocket
- */
- protected function acceptImpl() {
- $handle = @stream_socket_accept($this->listener_, $this->acceptTimeout_ / 1000.0);
- if(!$handle) return null;
-
- $socket = new TSocket();
- $socket->setHandle($handle);
-
- return $socket;
- }
-}
Modified: thrift/trunk/lib/php/src/transport/TServerTransport.php
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/php/src/transport/TServerTransport.php?rev=1381323&r1=1381322&r2=1381323&view=diff
==============================================================================
--- thrift/trunk/lib/php/src/transport/TServerTransport.php (original)
+++ thrift/trunk/lib/php/src/transport/TServerTransport.php Wed Sep 5 19:47:14 2012
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * Generic class for Server agent.
- *
- * @package thrift.transport
- */
-abstract class TServerTransport {
- /**
- * List for new clients
- *
- * @abstract
- * @return void
- */
- abstract public function listen();
-
- /**
- * Close the server
- *
- * @abstract
- * @return void
- */
- abstract public function close();
-
- /**
- * Subclasses should use this to implement
- * accept.
- *
- * @abstract
- * @return TTransport
- */
- protected abstract function acceptImpl();
-
- /**
- * Uses the accept implemtation. If null is returned, an
- * exception is thrown.
- *
- * @throws TTransportException
- * @return TTransport
- */
- public function accept() {
- $transport = $this->acceptImpl();
-
- if ($transport == null) {
- throw new TTransportException("accept() may not return NULL");
- }
-
- return $transport;
- }
-}