修正 LruCache 方法行为

xicilion · xicilion · commit 2baf90eae16c · 2017-03-22T18:37:19.000+08:00
diff --git a/docs b/docs
@@ -1 +1 @@
-Subproject commit f5e0c4b6f06c4b97c1051fe4189b4261b6eb9e27
+Subproject commit b2c239aaf5ee8ee37fa368e48d0487cfdd313d3e
diff --git a/fibjs/include/LruCache.h b/fibjs/include/LruCache.h
@@ -42,8 +42,7 @@ class LruCache: public LruCache_base
     virtual result_t get(exlib::string name, v8::Local<v8::Value> &retVal);
     virtual result_t get(exlib::string name, v8::Local<v8::Function> updater, v8::Local<v8::Value> &retVal);
     virtual result_t set(exlib::string name, v8::Local<v8::Value> value);
-    virtual result_t put(exlib::string name, v8::Local<v8::Value> value);
-    virtual result_t put(v8::Local<v8::Object> map);
+    virtual result_t set(v8::Local<v8::Object> map);
     virtual result_t remove(exlib::string name);
     virtual result_t isEmpty(bool &retVal);
 
diff --git a/fibjs/include/ifs/LruCache.h b/fibjs/include/ifs/LruCache.h
@@ -30,8 +30,7 @@ class LruCache_base : public object_base
     virtual result_t get(exlib::string name, v8::Local<v8::Value>& retVal) = 0;
     virtual result_t get(exlib::string name, v8::Local<v8::Function> updater, v8::Local<v8::Value>& retVal) = 0;
     virtual result_t set(exlib::string name, v8::Local<v8::Value> value) = 0;
-    virtual result_t put(exlib::string name, v8::Local<v8::Value> value) = 0;
-    virtual result_t put(v8::Local<v8::Object> map) = 0;
+    virtual result_t set(v8::Local<v8::Object> map) = 0;
     virtual result_t remove(exlib::string name) = 0;
     virtual result_t isEmpty(bool& retVal) = 0;
 
@@ -46,7 +45,6 @@ class LruCache_base : public object_base
     static void s_has(const v8::FunctionCallbackInfo<v8::Value>& args);
     static void s_get(const v8::FunctionCallbackInfo<v8::Value>& args);
     static void s_set(const v8::FunctionCallbackInfo<v8::Value>& args);
-    static void s_put(const v8::FunctionCallbackInfo<v8::Value>& args);
     static void s_remove(const v8::FunctionCallbackInfo<v8::Value>& args);
     static void s_isEmpty(const v8::FunctionCallbackInfo<v8::Value>& args);
 };
@@ -63,7 +61,6 @@ namespace fibjs
             {"has", s_has, false},
             {"get", s_get, false},
             {"set", s_set, false},
-            {"put", s_put, false},
             {"remove", s_remove, false},
             {"isEmpty", s_isEmpty, false}
         };
@@ -181,26 +178,11 @@ namespace fibjs
 
         hr = pInst->set(v0, v1);
 
-        METHOD_VOID();
-    }
-
-    inline void LruCache_base::s_put(const v8::FunctionCallbackInfo<v8::Value>& args)
-    {
-        METHOD_INSTANCE(LruCache_base);
-        METHOD_ENTER();
-
-        METHOD_OVER(2, 2);
-
-        ARG(exlib::string, 0);
-        ARG(v8::Local<v8::Value>, 1);
-
-        hr = pInst->put(v0, v1);
-
         METHOD_OVER(1, 1);
 
         ARG(v8::Local<v8::Object>, 0);
 
-        hr = pInst->put(v0);
+        hr = pInst->set(v0);
 
         METHOD_VOID();
     }
diff --git a/fibjs/include/ifs/LruCache.idl b/fibjs/include/ifs/LruCache.idl
@@ -39,22 +39,16 @@ interface LruCache : object
      */
     Value get(String name, Function updater);
 
-    /*! @brief 修改一个键值数据，键值不存在则不作任何操作
-     @param name 指定要设定的键值
-     @param value 指定要设定的数据
-     */
-    set(String name, Value value);
-
     /*! @brief 设定一个键值数据，键值不存在则插入一条新数据
      @param name 指定要设定的键值
      @param value 指定要设定的数据
      */
-    put(String name, Value value);
+    set(String name, Value value);
 
     /*! @brief 设定一个键值数据，键值不存在则插入新数据
      @param map 指定要设定的键值数据字典
      */
-    put(Object map);
+    set(Object map);
 
     /*! @brief 删除指定键值的全部值
      @param name 指定要删除的键值
diff --git a/fibjs/src/util/LruCache.cpp b/fibjs/src/util/LruCache.cpp
@@ -136,25 +136,6 @@ result_t LruCache::get(exlib::string name, v8::Local<v8::Function> updater,
 }
 
 result_t LruCache::set(exlib::string name, v8::Local<v8::Value> value)
-{
-    std::map<exlib::string, _linkedNode>::iterator find = m_datas.find(name);
-
-    if (find != m_datas.end())
-    {
-        update(find);
-        update_time(find);
-
-        if (m_timeout > 0)
-            find->second.insert.now();
-        SetPrivate(name, value);
-    }
-
-    cleanup();
-
-    return 0;
-}
-
-result_t LruCache::put(exlib::string name, v8::Local<v8::Value> value)
 {
     static _linkedNode newNode;
     std::map<exlib::string, _linkedNode>::iterator find = m_datas.find(name);
@@ -195,9 +176,9 @@ inline result_t _map(LruCache *o, v8::Local<v8::Object> m,
     return 0;
 }
 
-result_t LruCache::put(v8::Local<v8::Object> map)
+result_t LruCache::set(v8::Local<v8::Object> map)
 {
-    return _map(this, map, &LruCache::put);
+    return _map(this, map, &LruCache::set);
 }
 
 result_t LruCache::remove(exlib::string name)
diff --git a/test/util_test.js b/test/util_test.js
@@ -829,13 +829,13 @@ describe('util', () => {
             deepEqual(c.toJSON(), {});
         });
 
-        it("put", () => {
-            c.put("b", 100);
+        it("set", () => {
+            c.set("b", 100);
             deepEqual(c.toJSON(), {
                 "b": 100
             });
 
-            c.put({
+            c.set({
                 "b": 200,
                 "a": 100
             });
@@ -845,14 +845,6 @@ describe('util', () => {
             });
         });
 
-        it("set", () => {
-            c.set("c", 100);
-            deepEqual(c.toJSON(), {
-                "a": 100,
-                "b": 200
-            });
-        });
-
         it("has", () => {
             assert.isTrue(c.has('a'));
             assert.isFalse(c.has('c'));
@@ -887,13 +879,13 @@ describe('util', () => {
         it("size", () => {
             assert.equal(c.size, 0);
 
-            c.put('a', 100);
+            c.set('a', 100);
             assert.equal(c.size, 1);
 
-            c.put('b', 100);
-            c.put('c', 200);
-            c.put('d', 300);
-            c.put('e', 400);
+            c.set('b', 100);
+            c.set('c', 200);
+            c.set('d', 300);
+            c.set('e', 400);
 
             assert.equal(c.size, 3);
 
@@ -907,12 +899,12 @@ describe('util', () => {
         it("timeout", () => {
             c = new util.LruCache(3, 200);
 
-            c.put('f', 100);
-            c.put('d', 300);
-            c.put('e', 400);
+            c.set('f', 100);
+            c.set('d', 300);
+            c.set('e', 400);
 
             coroutine.sleep(100);
-            c.put('f', 500);
+            c.set('f', 500);
             deepEqual(c.toJSON(), {
                 "f": 500,
                 "e": 400,
@@ -926,7 +918,7 @@ describe('util', () => {
                 "d": 300
             });
 
-            c.put('e', 700);
+            c.set('e', 700);
 
             assert.equal(c.get('d'), 300);
             coroutine.sleep(101);
@@ -989,10 +981,10 @@ describe('util', () => {
             var no1 = os.memoryUsage().nativeObjects.objects;
 
             var lc = new util.LruCache(1024);
-            lc.put("test", lc);
+            lc.set("test", lc);
             assert.equal(no1 + 1, os.memoryUsage().nativeObjects.objects);
 
-            lc.put("test1", new Buffer());
+            lc.set("test1", new Buffer());
             assert.equal(no1 + 2, os.memoryUsage().nativeObjects.objects);
 
             lc.remove("test1");
