> On May 4, 2015, at 1:34 PM, [email protected] wrote:
>
> Repository: trafficserver
> Updated Branches:
> refs/heads/master bfa3ff44d -> 2c971b6ff
>
>
> Consistently use the CacheURL type in cache code.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
> Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2c971b6f
> Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2c971b6f
> Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2c971b6f
Hmmm, is there a real value to keep CacheURL at all? It’s
typedef URL CacheURL
And as far as I know, the expectation is that this is always going to be the
case? If so, why not just s/CacheURL/URL/ ?
— Leif
>
> Branch: refs/heads/master
> Commit: 2c971b6ff3d7e67b3d9c64e3eac1456cc6906d1f
> Parents: bfa3ff4
> Author: James Peach <[email protected]>
> Authored: Fri Apr 10 15:36:51 2015 -0700
> Committer: James Peach <[email protected]>
> Committed: Mon May 4 12:16:46 2015 -0700
>
> ----------------------------------------------------------------------
> iocore/cache/Cache.cc | 8 ++++----
> iocore/cache/I_Cache.h | 8 ++++----
> iocore/cache/P_CacheInternal.h | 10 +++++-----
> 3 files changed, 13 insertions(+), 13 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2c971b6f/iocore/cache/Cache.cc
> ----------------------------------------------------------------------
> diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
> index e98133f..5160349 100644
> --- a/iocore/cache/Cache.cc
> +++ b/iocore/cache/Cache.cc
> @@ -1246,7 +1246,7 @@ scan(Continuation *cont, char *hostname = 0, int
> host_len = 0, int KB_per_second
>
> #ifdef HTTP_CACHE
> Action *
> -CacheProcessor::lookup(Continuation *cont, URL *url, bool
> cluster_cache_local, bool local_only, CacheFragType frag_type)
> +CacheProcessor::lookup(Continuation *cont, CacheURL *url, bool
> cluster_cache_local, bool local_only, CacheFragType frag_type)
> {
> (void)local_only;
> INK_MD5 md5;
> @@ -3787,7 +3787,7 @@ ink_cache_init(ModuleVersion v)
>
> //----------------------------------------------------------------------------
> Action *
> -CacheProcessor::open_read(Continuation *cont, URL *url, bool
> cluster_cache_local, CacheHTTPHdr *request,
> +CacheProcessor::open_read(Continuation *cont, CacheURL *url, bool
> cluster_cache_local, CacheHTTPHdr *request,
> CacheLookupHttpConfig *params, time_t pin_in_cache,
> CacheFragType type)
> {
> #ifdef CLUSTER_CACHE
> @@ -3802,7 +3802,7 @@ CacheProcessor::open_read(Continuation *cont, URL *url,
> bool cluster_cache_local
>
> //----------------------------------------------------------------------------
> Action *
> -CacheProcessor::open_write(Continuation *cont, int expected_size, URL *url,
> bool cluster_cache_local, CacheHTTPHdr *request,
> +CacheProcessor::open_write(Continuation *cont, int expected_size, CacheURL
> *url, bool cluster_cache_local, CacheHTTPHdr *request,
> CacheHTTPInfo *old_info, time_t pin_in_cache,
> CacheFragType type)
> {
> #ifdef CLUSTER_CACHE
> @@ -3827,7 +3827,7 @@ CacheProcessor::open_write(Continuation *cont, int
> expected_size, URL *url, bool
> // Note: this should not be called from from the cluster processor, or bad
> // recursion could occur. This is merely a convenience wrapper.
> Action *
> -CacheProcessor::remove(Continuation *cont, URL *url, bool
> cluster_cache_local, CacheFragType frag_type)
> +CacheProcessor::remove(Continuation *cont, CacheURL *url, bool
> cluster_cache_local, CacheFragType frag_type)
> {
> CryptoHash id;
> int len = 0;
>
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2c971b6f/iocore/cache/I_Cache.h
> ----------------------------------------------------------------------
> diff --git a/iocore/cache/I_Cache.h b/iocore/cache/I_Cache.h
> index 857f312..56b2060 100644
> --- a/iocore/cache/I_Cache.h
> +++ b/iocore/cache/I_Cache.h
> @@ -88,14 +88,14 @@ struct CacheProcessor : public Processor {
> char *hostname = 0, int host_len = 0);
> Action *scan(Continuation *cont, char *hostname = 0, int host_len = 0, int
> KB_per_second = SCAN_KB_PER_SECOND);
> #ifdef HTTP_CACHE
> - Action *lookup(Continuation *cont, URL *url, bool cluster_cache_local,
> bool local_only = false,
> + Action *lookup(Continuation *cont, CacheURL *url, bool
> cluster_cache_local, bool local_only = false,
> CacheFragType frag_type = CACHE_FRAG_TYPE_HTTP);
> - inkcoreapi Action *open_read(Continuation *cont, URL *url, bool
> cluster_cache_local, CacheHTTPHdr *request,
> + inkcoreapi Action *open_read(Continuation *cont, CacheURL *url, bool
> cluster_cache_local, CacheHTTPHdr *request,
> CacheLookupHttpConfig *params, time_t
> pin_in_cache = (time_t)0,
> CacheFragType frag_type =
> CACHE_FRAG_TYPE_HTTP);
> - Action *open_write(Continuation *cont, int expected_size, URL *url, bool
> cluster_cache_local, CacheHTTPHdr *request,
> + Action *open_write(Continuation *cont, int expected_size, CacheURL *url,
> bool cluster_cache_local, CacheHTTPHdr *request,
> CacheHTTPInfo *old_info, time_t pin_in_cache =
> (time_t)0, CacheFragType frag_type = CACHE_FRAG_TYPE_HTTP);
> - Action *remove(Continuation *cont, URL *url, bool cluster_cache_local,
> CacheFragType frag_type = CACHE_FRAG_TYPE_HTTP);
> + Action *remove(Continuation *cont, CacheURL *url, bool
> cluster_cache_local, CacheFragType frag_type = CACHE_FRAG_TYPE_HTTP);
>
> Action *open_read_internal(int, Continuation *, MIOBuffer *, CacheURL *,
> CacheHTTPHdr *, CacheLookupHttpConfig *, CacheKey *,
> time_t, CacheFragType type, char *hostname, int
> host_len);
>
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2c971b6f/iocore/cache/P_CacheInternal.h
> ----------------------------------------------------------------------
> diff --git a/iocore/cache/P_CacheInternal.h b/iocore/cache/P_CacheInternal.h
> index ffec51a..19c5c64 100644
> --- a/iocore/cache/P_CacheInternal.h
> +++ b/iocore/cache/P_CacheInternal.h
> @@ -1032,15 +1032,15 @@ struct Cache {
> Action *scan(Continuation *cont, const char *hostname = 0, int host_len =
> 0, int KB_per_second = 2500);
>
> #ifdef HTTP_CACHE
> - Action *lookup(Continuation *cont, URL *url, CacheFragType type);
> + Action *lookup(Continuation *cont, CacheURL *url, CacheFragType type);
> inkcoreapi Action *open_read(Continuation *cont, const CacheKey *key,
> CacheHTTPHdr *request, CacheLookupHttpConfig *params,
> CacheFragType type, const char *hostname, int
> host_len);
> - Action *open_read(Continuation *cont, URL *url, CacheHTTPHdr *request,
> CacheLookupHttpConfig *params, CacheFragType type);
> + Action *open_read(Continuation *cont, CacheURL *url, CacheHTTPHdr
> *request, CacheLookupHttpConfig *params, CacheFragType type);
> Action *open_write(Continuation *cont, const CacheKey *key, CacheHTTPInfo
> *old_info, time_t pin_in_cache = (time_t)0,
> const CacheKey *key1 = NULL, CacheFragType type =
> CACHE_FRAG_TYPE_HTTP, const char *hostname = 0, int host_len = 0);
> - Action *open_write(Continuation *cont, URL *url, CacheHTTPHdr *request,
> CacheHTTPInfo *old_info, time_t pin_in_cache = (time_t)0,
> + Action *open_write(Continuation *cont, CacheURL *url, CacheHTTPHdr
> *request, CacheHTTPInfo *old_info, time_t pin_in_cache = (time_t)0,
> CacheFragType type = CACHE_FRAG_TYPE_HTTP);
> - static void generate_key(INK_MD5 *md5, URL *url);
> + static void generate_key(INK_MD5 *md5, CacheURL *url);
> #endif
>
> Action *link(Continuation *cont, const CacheKey *from, const CacheKey *to,
> CacheFragType type, const char *hostname, int host_len);
> @@ -1075,7 +1075,7 @@ Cache::open_read(Continuation *cont, CacheURL *url,
> CacheHTTPHdr *request, Cache
> }
>
> TS_INLINE void
> -Cache::generate_key(INK_MD5 *md5, URL *url)
> +Cache::generate_key(INK_MD5 *md5, CacheURL *url)
> {
> url->hash_get(md5);
> }
>
