merge Protocol class into Request\Request

duoshuo · Aug 31, 2014 · 708a1eb · 708a1eb
1 parent b18c035
commit 708a1eb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/Cassandra/Connection.php b/Cassandra/Connection.php
@@ -238,7 +238,7 @@ public function prepare($cql) {
 	 * @param int $consistency
 	 * @param int $serialConsistency
 	 */
-	public function exec($cql, array $values = [], $consistency = Protocol::CONSISTENCY_QUORUM, $serialConsistency = null){
+	public function exec($cql, array $values = [], $consistency = Request\Request::CONSISTENCY_QUORUM, $serialConsistency = null){
 		if ($this->connection === null)
 			$this->connect();
 
@@ -266,7 +266,7 @@ public function setKeyspace($keyspace) {
 		if ($this->connection === null)
 			return;
 
-		socket_write($this->connection, new Request\Query("USE {$this->keyspace};", Protocol::CONSISTENCY_QUORUM, null));
+		socket_write($this->connection, new Request\Query("USE {$this->keyspace};", Request\Request::CONSISTENCY_QUORUM, null));
 
 		$response = $this->getResponse();
 

diff --git a/Cassandra/Protocol.php b/Cassandra/Protocol.php
diff --git a/Cassandra/Request/Batch.php b/Cassandra/Request/Batch.php
@@ -31,7 +31,7 @@ class Batch extends Request{
 	 */
 	protected $_connection;
 
-	public function __construct($type = Batch::TYPE_LOGGED, $consistency = Protocol::CONSISTENCY_QUORUM, $serialConsistency = null) {
+	public function __construct($type = Batch::TYPE_LOGGED, $consistency = Request::CONSISTENCY_QUORUM, $serialConsistency = null) {
 		$this->_batchType = $type;
 		$this->_consistency = $consistency;
 		$this->_serialConsistency = $serialConsistency;

diff --git a/Cassandra/Request/Request.php b/Cassandra/Request/Request.php
@@ -5,6 +5,18 @@
 
 class Request implements Frame{
 
+	const CONSISTENCY_ANY = 0x0000;
+	const CONSISTENCY_ONE = 0x0001;
+	const CONSISTENCY_TWO = 0x0002;
+	const CONSISTENCY_THREE = 0x0003;
+	const CONSISTENCY_QUORUM = 0x0004;
+	const CONSISTENCY_ALL = 0x0005;
+	const CONSISTENCY_LOCAL_QUORUM = 0x0006;
+	const CONSISTENCY_EACH_QUORUM = 0x0007;
+	const CONSISTENCY_SERIAL = 0x0008;
+	const CONSISTENCY_LOCAL_SERIAL = 0x0009;
+	const CONSISTENCY_LOCAL_ONE = 0x000A;
+
 	/**
 	 * @var int
 	 */