Changeset 5456

Timestamp:

01/25/08 02:27:59 (10 months ago)

Author:

takuya

Message:

/lang/php/Cache/Handler/Resource/ キャッシュをファイルに保存部分の修正

Location:

lang/php/Cache/trunk/Handler/Resource

Files:

• File.php (modified) (11 diffs)
• Interface.php (modified) (1 diff)
• PDO.php (modified) (1 diff)

lang/php/Cache/trunk/Handler/Resource/File.php

@@ -8 +8 @@
 
 require_once 'Cache/Handler/Resource/Interface.php';
-require_once 'Cache/Handler/require_once/File_csv_utils.php';
+//CSVテスト中
+//require_once 'Cache/Handler/Resource/File_csv_utils.php';
+//CSVを簡単に扱う
+//TODO:Groupファイルなど共有ファイルはロックが必要
+//     flock 関数の記述を参考にすると
+//     [いくつかのオーペレーティングシステムでflock() はプロセスレベルで実装されています。]
+//     とのこと。
+//     http://jp.php.net/manual/ja/function.flock.php
+//
+function file_put_csv( $filename,$lines, $file_mode="w", $delim=",",  $enclosure="\"" )
+{
+        $fp = @fopen( $filename, $file_mode );
+        $state =null;
+        foreach( $lines as $idx => $line ){
+                $state = fputcsv( $fp, $line, $delim, $enclosure );
+        }
+        return $state;
+}
+//CSVを２次元配列に一括変換する関数
+function file_get_csv($filename, $length=100,$delim=",",$enclosure="\"")
+{
+        $data = array();
+        $fp = @fopen($filename,"r") /*or die("キャッシュファイルがない")*/;
+        while( $fp && ($buff=fgetcsv($fp,$length,$delim,$enclosure)) !==FALSE ){
+                $data[]=$buff;
+        }
+        return $data;
+}
+//キャッシュを扱うBackEndクラス。Fileシステムにキャッシュを格納する
+//キャッシュは１エントリ＝１ファイルが作成される
+//グループ管理のため　グループ一覧ファイルが１ファイル作成される
+//更新時刻管理のため　最終更新時刻ファイルが１ファイル作成される
 class Cache_Handler_Resource_File implements Cache_Handler_Resource_Interface {
     /** 
@@ -124 +155 @@
     public function remove( $id )
     {
-        $ret[] = unlink(  $this->getFullPath( $id ) );
+        $ret[] = $this->removeID($id);
         $ret[] = $this->removeFromGroup( $id );
         $ret[] = $this->removeModifiedIndex( $id );
         $ret[] = $this->removeLifeTimeIndex( $id );
         return ( $ret[0] && $ret[1] && $ret[2] && $ret[3] );
+    }
+    private function removeID($id){
+        return unlink( $this->getFullPath($id) );
     }
     /** 
@@ -250 +284 @@
         }
     }
-    
+    //---for cache system management --
+    //alisas for file_put_csv file_put_csvの記述場所をまだ決めていないから
+    public function saveList( $file_name, &$_array ){
+        return file_put_csv($file_name, $_array);
+    }
+    //alisas for file_get_csv. file_get_csvの記述場所をまだ決めていないから
+    public function readList( $file_name )
+    {
+        return file_get_csv( $file_name );
+    }
     //---------group mangers---------
     
@@ -261 +304 @@
     public function getGroupList()
     {
-        $lines = @file_get_contents( $this->getGroupListFileName() );
-        $array = array();
-        foreach ( explode( "\n", $lines ) as $line ) {
-            if ( $line == "" ) {
-                continue;
-            }
-            $array[] = explode( ",", $line );
-        }
-        return $array;
+        return  $this->readList( $this->getGroupListFileName() );
     }
     
@@ -298 +333 @@
         $_array = $this->getGroupList();
         $num   = sizeof( $_array );
-        if ( $num == 0 ) {
-            $_array[] = array( $id, $groupname );
-        }
-       foreach ( $groupnames as $groupname ) {
-            foreach ( $_array as $val ) {
-                // $val[0] is cache id, $val[1] is group name
-                if ( $val[0] == $id && $val[1] == $groupname ) {
-                    continue;//id is already exists in group
-                } else {
-                    $_array[] = array( $id, $groupname );
-                }
-            }
+        foreach( $groupnames as $groupname ){
+                $_array = $this->_addGroup($_array, $id, $groupname  );
         }
         if ( $num != sizeof( $_array ) ) {
@@ -317 +342 @@
         }
     }
-    public function _addGroup( $id,$groupnames ){
-        if ( !is_array( $groupnames ) ) {
-            $groupnames = array( $groupnames );
-        }
-        $_array = fgetcsv( $this->getGroupListFileName() );
-        
-        
+    public function _addGroup( &$_array, $id,$groupname ){
+        $already_exists = false;
+        foreach($_array as $entry ){
+                if( $entry[0] == $id && $entry[1] == $groupname  ){
+                        $already_exists = true;
+                        break;
+                }
+        }
+        if( $already_exists === false){
+                $_array[] = array( $id,$groupname );
+        }
+        return $_array;
     }
     /** 
@@ -343 +373 @@
     * @return boolean  true (succeeded) / false (faild)
     */
-    public function removeGroup( $groupname, &$ids = null )
+    public function removeGroup( $groupname )
     {
         $list = $this->getGroupList();
         //remove $group from group index file
         $buff = array();
-        $ids  = array();
-        foreach( $list as $val ){
-            if( $val[1] == $groupname ){
-                $ids[] = $val[0];
-            }else{
-                $buff[] = $val;
-            }
-        }
-        $ret[]= $this->saveGroupList( $buff );
-        unset( $buff1 );
-        //remove cache
-        if( sizeof($ids) == 0 ){
-            return;
-        }
-        
-        foreach( $ids as $id ){
-            $ret[] = $this->remove( $id );
-        }
-        //
-        $bool = true;
-        foreach( $ret as $b ){
-            $bool = $bool && $b;
-        }
-        return $bool;
+        foreach( $list as $idx => $entry ){
+                if($entry[1] == $groupname){
+                        $buff[] = $entry[0];//削除IDを取り出す
+                        unset( $list[$idx] );
+                }
+        }
+        //グループリストを更新する
+        $this->saveGroupList( $list );
+        //ID一覧を元にTTLとModifiedを消す
+        $this->removeLifeTimeIndex($buff);
+        $this->removeModifiedIndex($buff);
+        //IDを消す
+        $this->removeID($id);
     }
     
@@ -395 +414 @@
         $list = $this->getGroupList();
         //remove from index
-        $buff = array();
-        foreach( $list as $val ){
-            if( $group != null && $group == $va[1] && $val[0] == $id ){
-                continue;
-            }else if( $group == null &&  $val[0] == $id){
-                continue;
-            }else{
-                $buff[] = $val;
-            }
-        }
-        return $this->saveGroupList( $buff );
+        foreach( $list as $idx => $entry ){
+                if($entry[0] == $id && ( $group == null ||  $entry[1] == $group) ){
+                        unset( $entry[$idx] );
+                }
+        }
+        return $this->saveGroupList( $list );
     
     }
@@ -414 +428 @@
     * @return boolean  true (succeeded) / false (faild)
     */
-    public function saveGroupList( $list )
-    {
-        foreach( $list as $line ){
-            foreach( $line as $idx => $val ){
-                $line[$idx] = str_replace( ",", "", $line[$idx] );//remocve comma
-                $line[$idx] = trim( $line[$idx] );
-            }
-            $str .= implode( ",", $line );
-            $str .= "\n";
-        }
-        $ret = file_put_contents( $this->getGroupListFileName(), $str );
+    public function saveGroupList( &$list )
+    {
+        $ret = $this->saveList( $this->getGroupListFileName(), $list );
         return ( $ret > 0 );
     }
@@ -500 +506 @@
     /** 
     * save list
+    * TODO::CSVの扱いを一元化する
     * @access private
     * @param array array of array( "id"=>"date" )
@@ -577 +584 @@
     /** 
     * save list
+    * TODO::CSVの扱いを一元化する
     * @access private
     * @param array array of array( "id"=>"date" )

lang/php/Cache/trunk/Handler/Resource/Interface.php

@@ -7 +7 @@
  */
 
-interface Cache_Handler_Resource_Interface{
+interface Cache_Handler_Resource_Interface
+{
     
     /** 

lang/php/Cache/trunk/Handler/Resource/PDO.php

@@ -236 +236 @@
     protected function _select( $id )
     {
+        //ExpiredやGETで複数回同じQueryを出している問題点
         $_id = $this->escape( $id );
         $sql = "SELECT * FROM cache_data WHERE id = $_id";