Browse Source

Make Predis\Distribution\IDistributionStrategy extend the new Predis\Distribution\INodeKeyGenerator interface.

Daniele Alessandri 14 years ago
parent
commit
3f3c235363

+ 1 - 1
lib/Predis/Commands/Command.php

@@ -57,7 +57,7 @@ abstract class Command implements ICommand {
         return true;
         return true;
     }
     }
 
 
-    public function getHash(IDistributionStrategy $distributor) {
+    public function getHash(INodeKeyGenerator $distributor) {
         if (isset($this->_hash)) {
         if (isset($this->_hash)) {
             return $this->_hash;
             return $this->_hash;
         }
         }

+ 2 - 2
lib/Predis/Commands/ICommand.php

@@ -2,11 +2,11 @@
 
 
 namespace Predis\Commands;
 namespace Predis\Commands;
 
 
-use Predis\Distribution\IDistributionStrategy;
+use Predis\Distribution\INodeKeyGenerator;
 
 
 interface ICommand {
 interface ICommand {
     public function getId();
     public function getId();
-    public function getHash(IDistributionStrategy $distributor);
+    public function getHash(INodeKeyGenerator $distributor);
     public function setArguments(Array $arguments);
     public function setArguments(Array $arguments);
     public function getArguments();
     public function getArguments();
     public function parseResponse($data);
     public function parseResponse($data);

+ 1 - 2
lib/Predis/Distribution/IDistributionStrategy.php

@@ -2,9 +2,8 @@
 
 
 namespace Predis\Distribution;
 namespace Predis\Distribution;
 
 
-interface IDistributionStrategy {
+interface IDistributionStrategy extends INodeKeyGenerator {
     public function add($node, $weight = null);
     public function add($node, $weight = null);
     public function remove($node);
     public function remove($node);
     public function get($key);
     public function get($key);
-    public function generateKey($value);
 }
 }

+ 7 - 0
lib/Predis/Distribution/INodeKeyGenerator.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Predis\Distribution;
+
+interface INodeKeyGenerator {
+    public function generateKey($value);
+}