Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1C931101E6 for ; Thu, 17 Apr 2014 02:18:38 +0000 (UTC) Received: (qmail 19066 invoked by uid 500); 17 Apr 2014 02:17:52 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 18301 invoked by uid 500); 17 Apr 2014 02:17:22 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 17820 invoked by uid 99); 17 Apr 2014 02:17:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Apr 2014 02:17:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3DA8C93E268; Thu, 17 Apr 2014 02:17:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: samindaw@apache.org To: commits@airavata.apache.org Date: Thu, 17 Apr 2014 02:17:19 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/31] AIRAVATA-1143 http://git-wip-us.apache.org/repos/asf/airavata/blob/46205e6c/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Protocol/TCompactProtocol.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Protocol/TCompactProtocol.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Protocol/TCompactProtocol.php deleted file mode 100644 index e637a59..0000000 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Protocol/TCompactProtocol.php +++ /dev/null @@ -1,669 +0,0 @@ - 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)); - } - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/46205e6c/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Protocol/TJSONProtocol.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Protocol/TJSONProtocol.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Protocol/TJSONProtocol.php deleted file mode 100644 index 3d39583..0000000 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Protocol/TJSONProtocol.php +++ /dev/null @@ -1,694 +0,0 @@ - 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 BaseContext(); - $this->reader_ = new LookaheadReader($this); - } - - public function reset() { - $this->contextStack_ = array(); - $this->context_ = new BaseContext(); - $this->reader_ = new 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 PairContext($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 ListContext($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 PairContext($this)); - } - - private function readJSONObjectEnd() { - $this->readJSONSyntaxChar(self::RBRACE); - $this->popContext(); - } - - private function readJSONArrayStart() - { - $this->context_->read(); - $this->readJSONSyntaxChar(self::LBRACKET); - $this->pushContext(new ListContext($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; - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/46205e6c/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Protocol/TProtocol.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Protocol/TProtocol.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Protocol/TProtocol.php deleted file mode 100644 index 380ff10..0000000 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Protocol/TProtocol.php +++ /dev/null @@ -1,340 +0,0 @@ -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); - } - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/46205e6c/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Serializer/TBinarySerializer.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Serializer/TBinarySerializer.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Serializer/TBinarySerializer.php deleted file mode 100644 index 2a7cc3e..0000000 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Serializer/TBinarySerializer.php +++ /dev/null @@ -1,73 +0,0 @@ -getName(), - TMessageType::REPLY, $object, - 0, $protocol->isStrictWrite()); - - $protocol->readMessageBegin($unused_name, $unused_type, - $unused_seqid); - } else { - $object->write($protocol); - } - $protocol->getTransport()->flush(); - return $transport->getBuffer(); - } - - public static function deserialize($string_object, $class_name) { - $transport = new TMemoryBuffer(); - $protocol = new TBinaryProtocolAccelerated($transport); - if (function_exists('thrift_protocol_read_binary')) { - $protocol->writeMessageBegin('', TMessageType::REPLY, 0); - $transport->write($string_object); - return thrift_protocol_read_binary($protocol, $class_name, - $protocol->isStrictRead()); - } else { - $transport->write($string_object); - $object = new $class_name(); - $object->read($protocol); - return $object; - } - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/46205e6c/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TForkingServer.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TForkingServer.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TForkingServer.php deleted file mode 100644 index 6fca305..0000000 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TForkingServer.php +++ /dev/null @@ -1,119 +0,0 @@ -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; - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/46205e6c/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TServer.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TServer.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TServer.php deleted file mode 100644 index 343bf4b..0000000 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TServer.php +++ /dev/null @@ -1,101 +0,0 @@ -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(); -} http://git-wip-us.apache.org/repos/asf/airavata/blob/46205e6c/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TServerSocket.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TServerSocket.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TServerSocket.php deleted file mode 100644 index 00a6fb9..0000000 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TServerSocket.php +++ /dev/null @@ -1,98 +0,0 @@ -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; - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/46205e6c/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TServerTransport.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TServerTransport.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TServerTransport.php deleted file mode 100644 index 5324712..0000000 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TServerTransport.php +++ /dev/null @@ -1,54 +0,0 @@ -acceptImpl(); - - if ($transport == null) { - throw new TTransportException("accept() may not return NULL"); - } - - return $transport; - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/46205e6c/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TSimpleServer.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TSimpleServer.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TSimpleServer.php deleted file mode 100644 index 790e48f..0000000 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/Server/TSimpleServer.php +++ /dev/null @@ -1,57 +0,0 @@ -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; - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/46205e6c/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/StringFunc/Core.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/StringFunc/Core.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/StringFunc/Core.php deleted file mode 100644 index e38a5b2..0000000 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/StringFunc/Core.php +++ /dev/null @@ -1,38 +0,0 @@ -strlen($str) - $start; - } - - return mb_substr($str, $start, $length, '8bit'); - } - - public function strlen($str) { - return mb_strlen($str, '8bit'); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/46205e6c/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/StringFunc/TStringFunc.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/StringFunc/TStringFunc.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/StringFunc/TStringFunc.php deleted file mode 100644 index c5bb390..0000000 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/lib/Thrift/StringFunc/TStringFunc.php +++ /dev/null @@ -1,27 +0,0 @@ -