You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jk...@apache.org on 2018/01/16 14:23:26 UTC
[4/8] thrift git commit: THRIFT-4459: reduce php library directory
depth Client: php
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Server/TServerSocket.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Server/TServerSocket.php b/lib/php/lib/Thrift/Server/TServerSocket.php
deleted file mode 100644
index da8e226..0000000
--- a/lib/php/lib/Thrift/Server/TServerSocket.php
+++ /dev/null
@@ -1,122 +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
- */
-
-namespace Thrift\Server;
-
-use Thrift\Transport\TSocket;
-
-/**
- * Socket implementation of a server agent.
- *
- * @package thrift.transport
- */
-class TServerSocket extends TServerTransport
-{
- /**
- * Handle for the listener socket
- *
- * @var resource
- */
- protected $listener_;
-
- /**
- * Port for the listener to listen on
- *
- * @var int
- */
- protected $port_;
-
- /**
- * Timeout when listening for a new client
- *
- * @var int
- */
- protected $acceptTimeout_ = 30000;
-
- /**
- * Host to listen on
- *
- * @var string
- */
- protected $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;
- }
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Server/TServerTransport.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Server/TServerTransport.php b/lib/php/lib/Thrift/Server/TServerTransport.php
deleted file mode 100644
index f82d06d..0000000
--- a/lib/php/lib/Thrift/Server/TServerTransport.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Thrift\Server;
-
-use Thrift\Exception\TTransportException;
-
-/**
- * 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
- */
- abstract protected 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;
- }
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Server/TSimpleServer.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Server/TSimpleServer.php b/lib/php/lib/Thrift/Server/TSimpleServer.php
deleted file mode 100644
index e277700..0000000
--- a/lib/php/lib/Thrift/Server/TSimpleServer.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Thrift\Server;
-
-use Thrift\Exception\TTransportException;
-
-/**
- * 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;
- }
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/StoredMessageProtocol.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/StoredMessageProtocol.php b/lib/php/lib/Thrift/StoredMessageProtocol.php
deleted file mode 100644
index 476d9a6..0000000
--- a/lib/php/lib/Thrift/StoredMessageProtocol.php
+++ /dev/null
@@ -1,51 +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.processor
- */
-
-namespace Thrift;
-
-use Thrift\Protocol\TProtocol;
-use Thrift\Protocol\TProtocolDecorator;
-
-/**
- * Our goal was to work with any protocol. In order to do that, we needed
- * to allow them to call readMessageBegin() and get the Message in exactly
- * the standard format, without the service name prepended to the Message name.
- */
-class StoredMessageProtocol extends TProtocolDecorator
-{
- private $fname_, $mtype_, $rseqid_;
-
- public function __construct(TProtocol $protocol, $fname, $mtype, $rseqid)
- {
- parent::__construct($protocol);
- $this->fname_ = $fname;
- $this->mtype_ = $mtype;
- $this->rseqid_ = $rseqid;
- }
-
- public function readMessageBegin(&$name, &$type, &$seqid)
- {
- $name = $this->fname_;
- $type = $this->mtype_;
- $seqid = $this->rseqid_;
- }
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/StringFunc/Core.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/StringFunc/Core.php b/lib/php/lib/Thrift/StringFunc/Core.php
deleted file mode 100644
index 39a75b3..0000000
--- a/lib/php/lib/Thrift/StringFunc/Core.php
+++ /dev/null
@@ -1,40 +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.
- *
- */
-
-namespace Thrift\StringFunc;
-
-class Core implements TStringFunc
-{
- public function substr($str, $start, $length = null)
- {
- // specifying a null $length would return an empty string
- if ($length === null) {
- return substr($str, $start);
- }
-
- return substr($str, $start, $length);
- }
-
- public function strlen($str)
- {
- return strlen($str);
- }
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/StringFunc/Mbstring.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/StringFunc/Mbstring.php b/lib/php/lib/Thrift/StringFunc/Mbstring.php
deleted file mode 100644
index 968ff18..0000000
--- a/lib/php/lib/Thrift/StringFunc/Mbstring.php
+++ /dev/null
@@ -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.
- *
- */
-
-namespace Thrift\StringFunc;
-
-class Mbstring implements TStringFunc
-{
- public function substr($str, $start, $length = null)
- {
- /**
- * We need to set the charset parameter, which is the second
- * optional parameter and the first optional parameter can't
- * be null or false as a "magic" value because that would
- * cause an empty string to be returned, so we need to
- * actually calculate the proper length value.
- */
- if ($length === null) {
- $length = $this->strlen($str) - $start;
- }
-
- return mb_substr($str, $start, $length, '8bit');
- }
-
- public function strlen($str)
- {
- return mb_strlen($str, '8bit');
- }
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/StringFunc/TStringFunc.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/StringFunc/TStringFunc.php b/lib/php/lib/Thrift/StringFunc/TStringFunc.php
deleted file mode 100644
index dea497f..0000000
--- a/lib/php/lib/Thrift/StringFunc/TStringFunc.php
+++ /dev/null
@@ -1,28 +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.
- *
- */
-
-namespace Thrift\StringFunc;
-
-interface TStringFunc
-{
- public function substr($str, $start, $length = null);
- public function strlen($str);
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/TMultiplexedProcessor.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/TMultiplexedProcessor.php b/lib/php/lib/Thrift/TMultiplexedProcessor.php
deleted file mode 100644
index 0c2094d..0000000
--- a/lib/php/lib/Thrift/TMultiplexedProcessor.php
+++ /dev/null
@@ -1,117 +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.processor
- */
-
-namespace Thrift;
-
-use Thrift\Exception\TException;
-use Thrift\Protocol\TProtocol;
-use Thrift\Protocol\TMultiplexedProtocol;
-use Thrift\Type\TMessageType;
-
-/**
- * <code>TMultiplexedProcessor</code> is a Processor allowing
- * a single <code>TServer</code> to provide multiple services.
- *
- * <p>To do so, you instantiate the processor and then register additional
- * processors with it, as shown in the following example:</p>
- *
- * <blockquote><code>
- * $processor = new TMultiplexedProcessor();
- *
- * processor->registerProcessor(
- * "Calculator",
- * new \tutorial\CalculatorProcessor(new CalculatorHandler()));
- *
- * processor->registerProcessor(
- * "WeatherReport",
- * new \tutorial\WeatherReportProcessor(new WeatherReportHandler()));
- *
- * $processor->process($protocol, $protocol);
- * </code></blockquote>
- */
-
-class TMultiplexedProcessor
-{
- private $serviceProcessorMap_;
-
- /**
- * 'Register' a service with this <code>TMultiplexedProcessor</code>. This
- * allows us to broker requests to individual services by using the service
- * name to select them at request time.
- *
- * @param serviceName Name of a service, has to be identical to the name
- * declared in the Thrift IDL, e.g. "WeatherReport".
- * @param processor Implementation of a service, usually referred to
- * as "handlers", e.g. WeatherReportHandler implementing WeatherReport.Iface.
- */
- public function registerProcessor($serviceName, $processor)
- {
- $this->serviceProcessorMap_[$serviceName] = $processor;
- }
-
- /**
- * This implementation of <code>process</code> performs the following steps:
- *
- * <ol>
- * <li>Read the beginning of the message.</li>
- * <li>Extract the service name from the message.</li>
- * <li>Using the service name to locate the appropriate processor.</li>
- * <li>Dispatch to the processor, with a decorated instance of TProtocol
- * that allows readMessageBegin() to return the original Message.</li>
- * </ol>
- *
- * @throws TException If the message type is not CALL or ONEWAY, if
- * the service name was not found in the message, or if the service
- * name was not found in the service map.
- */
- public function process(TProtocol $input, TProtocol $output)
- {
- /*
- Use the actual underlying protocol (e.g. TBinaryProtocol) to read the
- message header. This pulls the message "off the wire", which we'll
- deal with at the end of this method.
- */
- $input->readMessageBegin($fname, $mtype, $rseqid);
-
- if ($mtype !== TMessageType::CALL && $mtype != TMessageType::ONEWAY) {
- throw new TException("This should not have happened!?");
- }
-
- // Extract the service name and the new Message name.
- if (strpos($fname, TMultiplexedProtocol::SEPARATOR) === false) {
- throw new TException("Service name not found in message name: {$fname}. Did you " .
- "forget to use a TMultiplexProtocol in your client?");
- }
- list($serviceName, $messageName) = explode(':', $fname, 2);
- if (!array_key_exists($serviceName, $this->serviceProcessorMap_)) {
- throw new TException("Service name not found: {$serviceName}. Did you forget " .
- "to call registerProcessor()?");
- }
-
- // Dispatch processing to the stored processor
- $processor = $this->serviceProcessorMap_[$serviceName];
-
- return $processor->process(
- new StoredMessageProtocol($input, $messageName, $mtype, $rseqid), $output
- );
- }
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Transport/TBufferedTransport.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Transport/TBufferedTransport.php b/lib/php/lib/Thrift/Transport/TBufferedTransport.php
deleted file mode 100644
index f654ad3..0000000
--- a/lib/php/lib/Thrift/Transport/TBufferedTransport.php
+++ /dev/null
@@ -1,181 +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
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * 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);
- } elseif ($have < $len) {
- $data = $this->rBuf_;
- $this->rBuf_ = '';
- $data .= $this->transport_->readAll($len - $have);
- } elseif ($have == $len) {
- $data = $this->rBuf_;
- $this->rBuf_ = '';
- } elseif ($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) {
- $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();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Transport/TCurlClient.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Transport/TCurlClient.php b/lib/php/lib/Thrift/Transport/TCurlClient.php
deleted file mode 100644
index c761cd0..0000000
--- a/lib/php/lib/Thrift/Transport/TCurlClient.php
+++ /dev/null
@@ -1,249 +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
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TTransportException;
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * HTTP client for Thrift
- *
- * @package thrift.transport
- */
-class TCurlClient extends TTransport
-{
- private static $curlHandle;
-
- /**
- * 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 $request_;
-
- /**
- * Buffer for the HTTP response data.
- *
- * @var binary string
- */
- protected $response_;
-
- /**
- * Read timeout
- *
- * @var float
- */
- protected $timeout_;
-
- /**
- * http headers
- *
- * @var array
- */
- protected $headers_;
-
- /**
- * 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->request_ = '';
- $this->response_ = null;
- $this->timeout_ = null;
- $this->headers_ = array();
- }
-
- /**
- * 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()
- {
- $this->request_ = '';
- $this->response_ = 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)
- {
- if ($len >= strlen($this->response_)) {
- return $this->response_;
- } else {
- $ret = substr($this->response_, 0, $len);
- $this->response_ = substr($this->response_, $len);
-
- return $ret;
- }
- }
-
- /**
- * Writes some data into the pending buffer
- *
- * @param string $buf The data to write
- * @throws TTransportException if writing fails
- */
- public function write($buf)
- {
- $this->request_ .= $buf;
- }
-
- /**
- * Opens and sends the actual request over the HTTP connection
- *
- * @throws TTransportException if a writing error occurs
- */
- public function flush()
- {
- if (!self::$curlHandle) {
- register_shutdown_function(array('Thrift\\Transport\\TCurlClient', 'closeCurlHandle'));
- self::$curlHandle = curl_init();
- curl_setopt(self::$curlHandle, CURLOPT_RETURNTRANSFER, true);
- curl_setopt(self::$curlHandle, CURLOPT_BINARYTRANSFER, true);
- curl_setopt(self::$curlHandle, CURLOPT_USERAGENT, 'PHP/TCurlClient');
- curl_setopt(self::$curlHandle, CURLOPT_CUSTOMREQUEST, 'POST');
- curl_setopt(self::$curlHandle, CURLOPT_FOLLOWLOCATION, true);
- curl_setopt(self::$curlHandle, CURLOPT_MAXREDIRS, 1);
- }
- // God, PHP really has some esoteric ways of doing simple things.
- $host = $this->host_.($this->port_ != 80 ? ':'.$this->port_ : '');
- $fullUrl = $this->scheme_."://".$host.$this->uri_;
-
- $headers = array();
- $defaultHeaders = array('Accept' => 'application/x-thrift',
- 'Content-Type' => 'application/x-thrift',
- 'Content-Length' => TStringFuncFactory::create()->strlen($this->request_));
- foreach (array_merge($defaultHeaders, $this->headers_) as $key => $value) {
- $headers[] = "$key: $value";
- }
-
- curl_setopt(self::$curlHandle, CURLOPT_HTTPHEADER, $headers);
-
- if ($this->timeout_ > 0) {
- curl_setopt(self::$curlHandle, CURLOPT_TIMEOUT, $this->timeout_);
- }
- curl_setopt(self::$curlHandle, CURLOPT_POSTFIELDS, $this->request_);
- $this->request_ = '';
-
- curl_setopt(self::$curlHandle, CURLOPT_URL, $fullUrl);
- $this->response_ = curl_exec(self::$curlHandle);
-
- // Connect failed?
- if (!$this->response_) {
- curl_close(self::$curlHandle);
- self::$curlHandle = null;
- $error = 'TCurlClient: Could not connect to '.$fullUrl;
- throw new TTransportException($error, TTransportException::NOT_OPEN);
- }
- }
-
- public static function closeCurlHandle()
- {
- try {
- if (self::$curlHandle) {
- curl_close(self::$curlHandle);
- self::$curlHandle = null;
- }
- } catch (\Exception $x) {
- error_log('There was an error closing the curl handle: ' . $x->getMessage());
- }
- }
-
- public function addHeaders($headers)
- {
- $this->headers_ = array_merge($this->headers_, $headers);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Transport/TFramedTransport.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Transport/TFramedTransport.php b/lib/php/lib/Thrift/Transport/TFramedTransport.php
deleted file mode 100644
index b8a64a9..0000000
--- a/lib/php/lib/Thrift/Transport/TFramedTransport.php
+++ /dev/null
@@ -1,193 +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
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * 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();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Transport/THttpClient.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Transport/THttpClient.php b/lib/php/lib/Thrift/Transport/THttpClient.php
deleted file mode 100644
index b372ab7..0000000
--- a/lib/php/lib/Thrift/Transport/THttpClient.php
+++ /dev/null
@@ -1,229 +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
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TTransportException;
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * 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_;
-
- /**
- * http headers
- *
- * @var array
- */
- protected $headers_;
-
- /**
- * 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;
- $this->headers_ = array();
- }
-
- /**
- * 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();
- $defaultHeaders = array('Host' => $host,
- 'Accept' => 'application/x-thrift',
- 'User-Agent' => 'PHP/THttpClient',
- 'Content-Type' => 'application/x-thrift',
- 'Content-Length' => TStringFuncFactory::create()->strlen($this->buf_));
- foreach (array_merge($defaultHeaders, $this->headers_) as $key => $value) {
- $headers[] = "$key: $value";
- }
-
- $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);
- }
- }
-
- public function addHeaders($headers)
- {
- $this->headers_ = array_merge($this->headers_, $headers);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Transport/TMemoryBuffer.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Transport/TMemoryBuffer.php b/lib/php/lib/Thrift/Transport/TMemoryBuffer.php
deleted file mode 100644
index ca31c57..0000000
--- a/lib/php/lib/Thrift/Transport/TMemoryBuffer.php
+++ /dev/null
@@ -1,100 +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
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TTransportException;
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * 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)
- {
- $bufLength = TStringFuncFactory::create()->strlen($this->buf_);
-
- if ($bufLength === 0) {
- throw new TTransportException('TMemoryBuffer: Could not read ' .
- $len . ' bytes from buffer.',
- TTransportException::UNKNOWN);
- }
-
- if ($bufLength <= $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;
- }
-
- public function getBuffer()
- {
- return $this->buf_;
- }
-
- public function available()
- {
- return TStringFuncFactory::create()->strlen($this->buf_);
- }
-
- public function putBack($data)
- {
- $this->buf_ = $data.$this->buf_;
- }
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Transport/TNullTransport.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Transport/TNullTransport.php b/lib/php/lib/Thrift/Transport/TNullTransport.php
deleted file mode 100644
index feeb7a4..0000000
--- a/lib/php/lib/Thrift/Transport/TNullTransport.php
+++ /dev/null
@@ -1,51 +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
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TTransportException;
-
-/**
- * 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) {}
-
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Transport/TPhpStream.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Transport/TPhpStream.php b/lib/php/lib/Thrift/Transport/TPhpStream.php
deleted file mode 100644
index 4c14cdf..0000000
--- a/lib/php/lib/Thrift/Transport/TPhpStream.php
+++ /dev/null
@@ -1,123 +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
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TException;
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * 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';
- }
-
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Transport/TSSLSocket.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Transport/TSSLSocket.php b/lib/php/lib/Thrift/Transport/TSSLSocket.php
deleted file mode 100644
index 533b7bb..0000000
--- a/lib/php/lib/Thrift/Transport/TSSLSocket.php
+++ /dev/null
@@ -1,112 +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
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TException;
-use Thrift\Exception\TTransportException;
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * Sockets implementation of the TTransport interface.
- *
- * @package thrift.transport
- */
-class TSSLSocket extends TSocket
-{
- /**
- * Remote port
- *
- * @var resource
- */
- protected $context_ = null;
-
- /**
- * Socket constructor
- *
- * @param string $host Remote hostname
- * @param int $port Remote port
- * @param resource $context Stream context
- * @param bool $persist Whether to use a persistent socket
- * @param string $debugHandler Function to call for error logging
- */
- public function __construct($host='localhost',
- $port=9090,
- $context=null,
- $debugHandler=null) {
- $this->host_ = $this->getSSLHost($host);
- $this->port_ = $port;
- $this->context_ = $context;
- $this->debugHandler_ = $debugHandler ? $debugHandler : 'error_log';
- }
-
- /**
- * Creates a host name with SSL transport protocol
- * if no transport protocol already specified in
- * the host name.
- *
- * @param string $host Host to listen on
- * @return string $host Host name with transport protocol
- */
- private function getSSLHost($host)
- {
- $transport_protocol_loc = strpos($host, "://");
- if ($transport_protocol_loc === false) {
- $host = 'ssl://'.$host;
- }
- return $host;
- }
-
- /**
- * Connects the socket.
- */
- public function open()
- {
- if ($this->isOpen()) {
- throw new TTransportException('Socket already connected', TTransportException::ALREADY_OPEN);
- }
-
- if (empty($this->host_)) {
- throw new TTransportException('Cannot open null host', TTransportException::NOT_OPEN);
- }
-
- if ($this->port_ <= 0) {
- throw new TTransportException('Cannot open without port', TTransportException::NOT_OPEN);
- }
-
- $this->handle_ = @stream_socket_client($this->host_.':'.$this->port_,
- $errno,
- $errstr,
- $this->sendTimeoutSec_ + ($this->sendTimeoutUsec_ / 1000000),
- STREAM_CLIENT_CONNECT,
- $this->context_);
-
- // Connect failed?
- if ($this->handle_ === FALSE) {
- $error = 'TSocket: Could not connect to '.$this->host_.':'.$this->port_.' ('.$errstr.' ['.$errno.'])';
- if ($this->debug_) {
- call_user_func($this->debugHandler_, $error);
- }
- throw new TException($error);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Transport/TSocket.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Transport/TSocket.php b/lib/php/lib/Thrift/Transport/TSocket.php
deleted file mode 100644
index a1872b9..0000000
--- a/lib/php/lib/Thrift/Transport/TSocket.php
+++ /dev/null
@@ -1,340 +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
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TException;
-use Thrift\Exception\TTransportException;
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * Sockets implementation of the TTransport interface.
- *
- * @package thrift.transport
- */
-class TSocket extends TTransport
-{
- /**
- * Handle to PHP socket
- *
- * @var resource
- */
- protected $handle_ = null;
-
- /**
- * Remote hostname
- *
- * @var string
- */
- protected $host_ = 'localhost';
-
- /**
- * Remote port
- *
- * @var int
- */
- protected $port_ = '9090';
-
- /**
- * Send timeout in seconds.
- *
- * Combined with sendTimeoutUsec this is used for send timeouts.
- *
- * @var int
- */
- protected $sendTimeoutSec_ = 0;
-
- /**
- * Send timeout in microseconds.
- *
- * Combined with sendTimeoutSec this is used for send timeouts.
- *
- * @var int
- */
- protected $sendTimeoutUsec_ = 100000;
-
- /**
- * Recv timeout in seconds
- *
- * Combined with recvTimeoutUsec this is used for recv timeouts.
- *
- * @var int
- */
- protected $recvTimeoutSec_ = 0;
-
- /**
- * Recv timeout in microseconds
- *
- * Combined with recvTimeoutSec this is used for recv timeouts.
- *
- * @var int
- */
- protected $recvTimeoutUsec_ = 750000;
-
- /**
- * Persistent socket or plain?
- *
- * @var bool
- */
- protected $persist_ = false;
-
- /**
- * Debugging on?
- *
- * @var bool
- */
- protected $debug_ = false;
-
- /**
- * Debug handler
- *
- * @var mixed
- */
- protected $debugHandler_ = null;
-
- /**
- * Socket constructor
- *
- * @param string $host Remote hostname
- * @param int $port Remote port
- * @param bool $persist Whether to use a persistent socket
- * @param string $debugHandler Function to call for error logging
- */
- public function __construct($host='localhost',
- $port=9090,
- $persist=false,
- $debugHandler=null) {
- $this->host_ = $host;
- $this->port_ = $port;
- $this->persist_ = $persist;
- $this->debugHandler_ = $debugHandler ? $debugHandler : 'error_log';
- }
-
- /**
- * @param resource $handle
- * @return void
- */
- public function setHandle($handle)
- {
- $this->handle_ = $handle;
- }
-
- /**
- * Sets the send timeout.
- *
- * @param int $timeout Timeout in milliseconds.
- */
- public function setSendTimeout($timeout)
- {
- $this->sendTimeoutSec_ = floor($timeout / 1000);
- $this->sendTimeoutUsec_ =
- ($timeout - ($this->sendTimeoutSec_ * 1000)) * 1000;
- }
-
- /**
- * Sets the receive timeout.
- *
- * @param int $timeout Timeout in milliseconds.
- */
- public function setRecvTimeout($timeout)
- {
- $this->recvTimeoutSec_ = floor($timeout / 1000);
- $this->recvTimeoutUsec_ =
- ($timeout - ($this->recvTimeoutSec_ * 1000)) * 1000;
- }
-
- /**
- * Sets debugging output on or off
- *
- * @param bool $debug
- */
- public function setDebug($debug)
- {
- $this->debug_ = $debug;
- }
-
- /**
- * Get the host that this socket is connected to
- *
- * @return string host
- */
- public function getHost()
- {
- return $this->host_;
- }
-
- /**
- * Get the remote port that this socket is connected to
- *
- * @return int port
- */
- public function getPort()
- {
- return $this->port_;
- }
-
- /**
- * Tests whether this is open
- *
- * @return bool true if the socket is open
- */
- public function isOpen()
- {
- return is_resource($this->handle_);
- }
-
- /**
- * Connects the socket.
- */
- public function open()
- {
- if ($this->isOpen()) {
- throw new TTransportException('Socket already connected', TTransportException::ALREADY_OPEN);
- }
-
- if (empty($this->host_)) {
- throw new TTransportException('Cannot open null host', TTransportException::NOT_OPEN);
- }
-
- if ($this->port_ <= 0) {
- throw new TTransportException('Cannot open without port', TTransportException::NOT_OPEN);
- }
-
- if ($this->persist_) {
- $this->handle_ = @pfsockopen($this->host_,
- $this->port_,
- $errno,
- $errstr,
- $this->sendTimeoutSec_ + ($this->sendTimeoutUsec_ / 1000000));
- } else {
- $this->handle_ = @fsockopen($this->host_,
- $this->port_,
- $errno,
- $errstr,
- $this->sendTimeoutSec_ + ($this->sendTimeoutUsec_ / 1000000));
- }
-
- // Connect failed?
- if ($this->handle_ === FALSE) {
- $error = 'TSocket: Could not connect to '.$this->host_.':'.$this->port_.' ('.$errstr.' ['.$errno.'])';
- if ($this->debug_) {
- call_user_func($this->debugHandler_, $error);
- }
- throw new TException($error);
- }
-
- if (function_exists('socket_import_stream') && function_exists('socket_set_option')) {
- $socket = socket_import_stream($this->handle_);
- socket_set_option($socket, SOL_TCP, TCP_NODELAY, 1);
- }
- }
-
- /**
- * Closes the socket.
- */
- public function close()
- {
- @fclose($this->handle_);
- $this->handle_ = null;
- }
-
- /**
- * Read from the socket at most $len bytes.
- *
- * This method will not wait for all the requested data, it will return as
- * soon as any data is received.
- *
- * @param int $len Maximum number of bytes to read.
- * @return string Binary data
- */
- public function read($len)
- {
- $null = null;
- $read = array($this->handle_);
- $readable = @stream_select($read, $null, $null, $this->recvTimeoutSec_, $this->recvTimeoutUsec_);
-
- if ($readable > 0) {
- $data = fread($this->handle_, $len);
- if ($data === false) {
- throw new TTransportException('TSocket: Could not read '.$len.' bytes from '.
- $this->host_.':'.$this->port_);
- } elseif ($data == '' && feof($this->handle_)) {
- throw new TTransportException('TSocket read 0 bytes');
- }
-
- return $data;
- } elseif ($readable === 0) {
- throw new TTransportException('TSocket: timed out reading '.$len.' bytes from '.
- $this->host_.':'.$this->port_);
- } else {
- throw new TTransportException('TSocket: Could not read '.$len.' bytes from '.
- $this->host_.':'.$this->port_);
- }
- }
-
- /**
- * Write to the socket.
- *
- * @param string $buf The data to write
- */
- public function write($buf)
- {
- $null = null;
- $write = array($this->handle_);
-
- // keep writing until all the data has been written
- while (TStringFuncFactory::create()->strlen($buf) > 0) {
- // wait for stream to become available for writing
- $writable = @stream_select($null, $write, $null, $this->sendTimeoutSec_, $this->sendTimeoutUsec_);
- if ($writable > 0) {
- // write buffer to stream
- $written = fwrite($this->handle_, $buf);
- if ($written === -1 || $written === false) {
- throw new TTransportException('TSocket: Could not write '.TStringFuncFactory::create()->strlen($buf).' bytes '.
- $this->host_.':'.$this->port_);
- }
- // determine how much of the buffer is left to write
- $buf = TStringFuncFactory::create()->substr($buf, $written);
- } elseif ($writable === 0) {
- throw new TTransportException('TSocket: timed out writing '.TStringFuncFactory::create()->strlen($buf).' bytes from '.
- $this->host_.':'.$this->port_);
- } else {
- throw new TTransportException('TSocket: Could not write '.TStringFuncFactory::create()->strlen($buf).' bytes '.
- $this->host_.':'.$this->port_);
- }
- }
- }
-
- /**
- * Flush output to the socket.
- *
- * Since read(), readAll() and write() operate on the sockets directly,
- * this is a no-op
- *
- * If you wish to have flushable buffering behaviour, wrap this TSocket
- * in a TBufferedTransport.
- */
- public function flush()
- {
- // no-op
- }
- }
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Transport/TSocketPool.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Transport/TSocketPool.php b/lib/php/lib/Thrift/Transport/TSocketPool.php
deleted file mode 100644
index 18ffd8d..0000000
--- a/lib/php/lib/Thrift/Transport/TSocketPool.php
+++ /dev/null
@@ -1,300 +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
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Exception\TException;
-
-/**
- * This library makes use of APC cache to make hosts as down in a web
- * environment. If you are running from the CLI or on a system without APC
- * installed, then these null functions will step in and act like cache
- * misses.
- */
-if (!function_exists('apc_fetch')) {
- function apc_fetch($key) { return FALSE; }
- function apc_store($key, $var, $ttl=0) { return FALSE; }
-}
-
-/**
- * Sockets implementation of the TTransport interface that allows connection
- * to a pool of servers.
- *
- * @package thrift.transport
- */
-class TSocketPool extends TSocket
-{
- /**
- * Remote servers. Array of associative arrays with 'host' and 'port' keys
- */
- private $servers_ = array();
-
- /**
- * How many times to retry each host in connect
- *
- * @var int
- */
- private $numRetries_ = 1;
-
- /**
- * Retry interval in seconds, how long to not try a host if it has been
- * marked as down.
- *
- * @var int
- */
- private $retryInterval_ = 60;
-
- /**
- * Max consecutive failures before marking a host down.
- *
- * @var int
- */
- private $maxConsecutiveFailures_ = 1;
-
- /**
- * Try hosts in order? or Randomized?
- *
- * @var bool
- */
- private $randomize_ = true;
-
- /**
- * Always try last host, even if marked down?
- *
- * @var bool
- */
- private $alwaysTryLast_ = true;
-
- /**
- * Socket pool constructor
- *
- * @param array $hosts List of remote hostnames
- * @param mixed $ports Array of remote ports, or a single common port
- * @param bool $persist Whether to use a persistent socket
- * @param mixed $debugHandler Function for error logging
- */
- public function __construct($hosts=array('localhost'),
- $ports=array(9090),
- $persist=false,
- $debugHandler=null) {
- parent::__construct(null, 0, $persist, $debugHandler);
-
- if (!is_array($ports)) {
- $port = $ports;
- $ports = array();
- foreach ($hosts as $key => $val) {
- $ports[$key] = $port;
- }
- }
-
- foreach ($hosts as $key => $host) {
- $this->servers_ []= array('host' => $host,
- 'port' => $ports[$key]);
- }
- }
-
- /**
- * Add a server to the pool
- *
- * This function does not prevent you from adding a duplicate server entry.
- *
- * @param string $host hostname or IP
- * @param int $port port
- */
- public function addServer($host, $port)
- {
- $this->servers_[] = array('host' => $host, 'port' => $port);
- }
-
- /**
- * Sets how many time to keep retrying a host in the connect function.
- *
- * @param int $numRetries
- */
- public function setNumRetries($numRetries)
- {
- $this->numRetries_ = $numRetries;
- }
-
- /**
- * Sets how long to wait until retrying a host if it was marked down
- *
- * @param int $numRetries
- */
- public function setRetryInterval($retryInterval)
- {
- $this->retryInterval_ = $retryInterval;
- }
-
- /**
- * Sets how many time to keep retrying a host before marking it as down.
- *
- * @param int $numRetries
- */
- public function setMaxConsecutiveFailures($maxConsecutiveFailures)
- {
- $this->maxConsecutiveFailures_ = $maxConsecutiveFailures;
- }
-
- /**
- * Turns randomization in connect order on or off.
- *
- * @param bool $randomize
- */
- public function setRandomize($randomize)
- {
- $this->randomize_ = $randomize;
- }
-
- /**
- * Whether to always try the last server.
- *
- * @param bool $alwaysTryLast
- */
- public function setAlwaysTryLast($alwaysTryLast)
- {
- $this->alwaysTryLast_ = $alwaysTryLast;
- }
-
- /**
- * Connects the socket by iterating through all the servers in the pool
- * and trying to find one that works.
- */
- public function open()
- {
- // Check if we want order randomization
- if ($this->randomize_) {
- shuffle($this->servers_);
- }
-
- // Count servers to identify the "last" one
- $numServers = count($this->servers_);
-
- for ($i = 0; $i < $numServers; ++$i) {
-
- // This extracts the $host and $port variables
- extract($this->servers_[$i]);
-
- // Check APC cache for a record of this server being down
- $failtimeKey = 'thrift_failtime:'.$host.':'.$port.'~';
-
- // Cache miss? Assume it's OK
- $lastFailtime = apc_fetch($failtimeKey);
- if ($lastFailtime === FALSE) {
- $lastFailtime = 0;
- }
-
- $retryIntervalPassed = false;
-
- // Cache hit...make sure enough the retry interval has elapsed
- if ($lastFailtime > 0) {
- $elapsed = time() - $lastFailtime;
- if ($elapsed > $this->retryInterval_) {
- $retryIntervalPassed = true;
- if ($this->debug_) {
- call_user_func($this->debugHandler_,
- 'TSocketPool: retryInterval '.
- '('.$this->retryInterval_.') '.
- 'has passed for host '.$host.':'.$port);
- }
- }
- }
-
- // Only connect if not in the middle of a fail interval, OR if this
- // is the LAST server we are trying, just hammer away on it
- $isLastServer = false;
- if ($this->alwaysTryLast_) {
- $isLastServer = ($i == ($numServers - 1));
- }
-
- if (($lastFailtime === 0) ||
- ($isLastServer) ||
- ($lastFailtime > 0 && $retryIntervalPassed)) {
-
- // Set underlying TSocket params to this one
- $this->host_ = $host;
- $this->port_ = $port;
-
- // Try up to numRetries_ connections per server
- for ($attempt = 0; $attempt < $this->numRetries_; $attempt++) {
- try {
- // Use the underlying TSocket open function
- parent::open();
-
- // Only clear the failure counts if required to do so
- if ($lastFailtime > 0) {
- apc_store($failtimeKey, 0);
- }
-
- // Successful connection, return now
- return;
-
- } catch (TException $tx) {
- // Connection failed
- }
- }
-
- // Mark failure of this host in the cache
- $consecfailsKey = 'thrift_consecfails:'.$host.':'.$port.'~';
-
- // Ignore cache misses
- $consecfails = apc_fetch($consecfailsKey);
- if ($consecfails === FALSE) {
- $consecfails = 0;
- }
-
- // Increment by one
- $consecfails++;
-
- // Log and cache this failure
- if ($consecfails >= $this->maxConsecutiveFailures_) {
- if ($this->debug_) {
- call_user_func($this->debugHandler_,
- 'TSocketPool: marking '.$host.':'.$port.
- ' as down for '.$this->retryInterval_.' secs '.
- 'after '.$consecfails.' failed attempts.');
- }
- // Store the failure time
- apc_store($failtimeKey, time());
-
- // Clear the count of consecutive failures
- apc_store($consecfailsKey, 0);
- } else {
- apc_store($consecfailsKey, $consecfails);
- }
- }
- }
-
- // Oh no; we failed them all. The system is totally ill!
- $error = 'TSocketPool: All hosts in pool are down. ';
- $hosts = array();
- foreach ($this->servers_ as $server) {
- $hosts []= $server['host'].':'.$server['port'];
- }
- $hostlist = implode(',', $hosts);
- $error .= '('.$hostlist.')';
- if ($this->debug_) {
- call_user_func($this->debugHandler_, $error);
- }
- throw new TException($error);
- }
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Transport/TTransport.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Transport/TTransport.php b/lib/php/lib/Thrift/Transport/TTransport.php
deleted file mode 100644
index 99c39ff..0000000
--- a/lib/php/lib/Thrift/Transport/TTransport.php
+++ /dev/null
@@ -1,95 +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
- */
-
-namespace Thrift\Transport;
-
-use Thrift\Factory\TStringFuncFactory;
-
-/**
- * Base interface for a transport agent.
- *
- * @package thrift.transport
- */
-abstract class TTransport
-{
- /**
- * Whether this transport is open.
- *
- * @return boolean true if open
- */
- abstract public function isOpen();
-
- /**
- * Open the transport for reading/writing
- *
- * @throws TTransportException if cannot open
- */
- abstract public function open();
-
- /**
- * Close the transport.
- */
- abstract public function close();
-
- /**
- * 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
- */
- abstract public function read($len);
-
- /**
- * Guarantees that the full amount of data is read.
- *
- * @return string The data, of exact length
- * @throws TTransportException if cannot read data
- */
- public function readAll($len)
- {
- // return $this->read($len);
-
- $data = '';
- $got = 0;
- while (($got = TStringFuncFactory::create()->strlen($data)) < $len) {
- $data .= $this->read($len - $got);
- }
-
- return $data;
- }
-
- /**
- * Writes the given data out.
- *
- * @param string $buf The data to write
- * @throws TTransportException if writing fails
- */
- abstract public function write($buf);
-
- /**
- * Flushes any pending data out of a buffer
- *
- * @throws TTransportException if a writing error occurs
- */
- public function flush() {}
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Type/TConstant.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Type/TConstant.php b/lib/php/lib/Thrift/Type/TConstant.php
deleted file mode 100644
index 7c8eceb..0000000
--- a/lib/php/lib/Thrift/Type/TConstant.php
+++ /dev/null
@@ -1,50 +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
- */
-
-namespace Thrift\Type;
-
-/**
- * Base class for constant Management
- */
-abstract class TConstant
-{
- /**
- * Don't instanciate this class
- */
- protected function __construct() {}
-
- /**
- * Get a constant value
- * @param string $constant
- * @return mixed
- */
- public static function get($constant)
- {
- if (is_null(static::$$constant)) {
- static::$$constant = call_user_func(
- sprintf('static::init_%s', $constant)
- );
- }
-
- return static::$$constant;
- }
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Type/TMessageType.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Type/TMessageType.php b/lib/php/lib/Thrift/Type/TMessageType.php
deleted file mode 100644
index bff224f..0000000
--- a/lib/php/lib/Thrift/Type/TMessageType.php
+++ /dev/null
@@ -1,34 +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
- */
-
-namespace Thrift\Type;
-
-/**
- * Message types for RPC
- */
-class TMessageType
-{
- const CALL = 1;
- const REPLY = 2;
- const EXCEPTION = 3;
- const ONEWAY = 4;
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Thrift/Type/TType.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Thrift/Type/TType.php b/lib/php/lib/Thrift/Type/TType.php
deleted file mode 100644
index 71219c2..0000000
--- a/lib/php/lib/Thrift/Type/TType.php
+++ /dev/null
@@ -1,47 +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
- */
-
-namespace Thrift\Type;
-
-/**
- * Data types that can be sent via Thrift
- */
-class TType
-{
- const STOP = 0;
- const VOID = 1;
- const BOOL = 2;
- const BYTE = 3;
- const I08 = 3;
- const DOUBLE = 4;
- const I16 = 6;
- const I32 = 8;
- const I64 = 10;
- const STRING = 11;
- const UTF7 = 11;
- const STRUCT = 12;
- const MAP = 13;
- const SET = 14;
- const LST = 15; // N.B. cannot use LIST keyword in PHP!
- const UTF8 = 16;
- const UTF16 = 17;
-}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bfba370b/lib/php/lib/Transport/TBufferedTransport.php
----------------------------------------------------------------------
diff --git a/lib/php/lib/Transport/TBufferedTransport.php b/lib/php/lib/Transport/TBufferedTransport.php
new file mode 100644
index 0000000..f654ad3
--- /dev/null
+++ b/lib/php/lib/Transport/TBufferedTransport.php
@@ -0,0 +1,181 @@
+<?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
+ */
+
+namespace Thrift\Transport;
+
+use Thrift\Factory\TStringFuncFactory;
+
+/**
+ * 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);
+ } elseif ($have < $len) {
+ $data = $this->rBuf_;
+ $this->rBuf_ = '';
+ $data .= $this->transport_->readAll($len - $have);
+ } elseif ($have == $len) {
+ $data = $this->rBuf_;
+ $this->rBuf_ = '';
+ } elseif ($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) {
+ $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();
+ }
+
+}