git commit: TS-2661: Remove unused HttpSM::decide_cached_url method.

[am...@apache.org]

Repository: trafficserver
Updated Branches:
  refs/heads/master 7d3f9c82e -> 059b9c845


TS-2661: Remove unused HttpSM::decide_cached_url method.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/059b9c84
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/059b9c84
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/059b9c84

Branch: refs/heads/master
Commit: 059b9c8453073f7f8d9eaa529f9d803fd093c056
Parents: 7d3f9c8
Author: Alan M. Carroll <am...@network-geographics.com>
Authored: Tue Mar 25 11:14:25 2014 -0500
Committer: Alan M. Carroll <am...@network-geographics.com>
Committed: Tue Mar 25 11:14:25 2014 -0500

----------------------------------------------------------------------
 CHANGES              |  2 ++
 proxy/http/HttpSM.cc | 52 -----------------------------------------------
 proxy/http/HttpSM.h  |  1 -
 3 files changed, 2 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/059b9c84/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index da8b67e..0f20b07 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.0.0
 
+  *) [TS-2661] Remove unused HttpSM::decided_cached_url.
+
   *) [TS-2658] Additional debug logging for SSL certificates.
 
   *) [TS-2431] Migrate Taobao SPDY plugin to ATS core.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/059b9c84/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index b314bc9..2cb19eb 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -432,58 +432,6 @@ HttpSM::init()
 
 }
 
-bool
-HttpSM::decide_cached_url(URL * s_url)
-{
-  INK_MD5 md5s, md5l, md5o;
-  bool result = false;
-
-  s_url->MD5_get(&md5s);
-  if (second_cache_sm == NULL) {
-    if (cache_sm.cache_write_vc == NULL && t_state.cache_info.write_lock_state == HttpTransact::CACHE_WL_INIT)
-      return true;
-
-    cache_sm.get_lookup_url()->MD5_get(&md5l);
-    result = (md5s == md5l) ? true : false;
-  } else {
-    // we only get here after we already issued the cache writes
-    // do we need another cache_info for second_cache_sm???????
-    cache_sm.get_lookup_url()->MD5_get(&md5l);
-    second_cache_sm->get_lookup_url()->MD5_get(&md5o);
-
-    if (md5s == md5o) {
-      cache_sm.end_both();
-      t_state.cache_info.object_read = t_state.cache_info.second_object_read;
-      t_state.cache_info.second_object_read = NULL;
-      cache_sm.set_lookup_url(second_cache_sm->get_lookup_url());
-      second_cache_sm->set_lookup_url(NULL);
-      cache_sm.cache_read_vc = second_cache_sm->cache_read_vc;
-      second_cache_sm->cache_read_vc = NULL;
-      cache_sm.read_locked = second_cache_sm->read_locked;
-      cache_sm.cache_write_vc = second_cache_sm->cache_write_vc;
-      second_cache_sm->cache_write_vc = NULL;
-      cache_sm.write_locked = second_cache_sm->write_locked;
-    } else if (md5s == md5l) {
-      second_cache_sm->end_both();
-    } else {
-      cache_sm.end_both();
-      second_cache_sm->end_both();
-    }
-
-    second_cache_sm->mutex.clear();
-    delete second_cache_sm;
-    second_cache_sm = NULL;
-
-    result = cache_sm.cache_write_vc ? true : false;
-    if (result == false) {
-      t_state.cache_info.action = HttpTransact::CACHE_DO_NO_ACTION;
-    } else
-      DebugSM("http_cache_write", "[%" PRId64 "] cache write decide to use URL %s", sm_id, s_url->string_get(&t_state.arena));
-  }
-
-  return result;
-}
-
 void
 HttpSM::set_ua_half_close_flag()
 {

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/059b9c84/proxy/http/HttpSM.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.h b/proxy/http/HttpSM.h
index 53069ff..0a0a23e 100644
--- a/proxy/http/HttpSM.h
+++ b/proxy/http/HttpSM.h
@@ -263,7 +263,6 @@ public:
   void add_history_entry(const char *fileline, int event, int reentrant);
   void add_cache_sm();
   bool is_private();
-  bool decide_cached_url(URL * s_url);
 
   TSClientProtoStack proto_stack;
   int64_t sm_id;