Repository: trafficserver Updated Branches: refs/heads/master ca9450b8f -> be7eeac80
TS-2599: Remove dead code in RecCore related to Record Types Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/be7eeac8 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/be7eeac8 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/be7eeac8 Branch: refs/heads/master Commit: be7eeac8080533ae36edcaf2b3929cad57c16e77 Parents: ca9450b Author: Phil Sorber <[email protected]> Authored: Thu Feb 27 15:37:37 2014 -0700 Committer: Phil Sorber <[email protected]> Committed: Thu Feb 27 15:37:37 2014 -0700 ---------------------------------------------------------------------- CHANGES | 2 ++ lib/records/I_RecCore.h | 1 - lib/records/I_RecDefs.h | 3 +-- lib/records/P_RecCore.cc | 1 - lib/records/P_RecCore.h | 1 - lib/records/RecCore.cc | 12 ------------ proxy/api/ts/ts.h.in | 3 +-- 7 files changed, 4 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/be7eeac8/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 11e6cd9..75570eb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.0.0 + *) [TS-2599] Remove dead code in RedCore related to Record Types + *) [TS-2593] HTTPS to origin fails on CentOS6.x. This is a regression of sort from TS-2355. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/be7eeac8/lib/records/I_RecCore.h ---------------------------------------------------------------------- diff --git a/lib/records/I_RecCore.h b/lib/records/I_RecCore.h index 5bc1358..38b2a66 100644 --- a/lib/records/I_RecCore.h +++ b/lib/records/I_RecCore.h @@ -152,7 +152,6 @@ int RecGetRecordByte(const char *name, RecByte * rec_byte, bool lock = true); int RecGetRecordType(const char *name, RecT * rec_type, bool lock = true); int RecGetRecordDataType(const char *name, RecDataT * data_type, bool lock = true); int RecGetRecordPersistenceType(const char *name, RecPersistT * persist_type, bool lock = true); -int RecGetRecordUpdateCount(RecT data_type); int RecGetRecordOrderAndId(const char *name, int *order, int *id, bool lock = true); int RecGetRecordUpdateType(const char *name, RecUpdateT * update_type, bool lock = true); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/be7eeac8/lib/records/I_RecDefs.h ---------------------------------------------------------------------- diff --git a/lib/records/I_RecDefs.h b/lib/records/I_RecDefs.h index f3acc6a..232d95c 100644 --- a/lib/records/I_RecDefs.h +++ b/lib/records/I_RecDefs.h @@ -63,8 +63,7 @@ enum RecT RECT_CLUSTER = 8, RECT_LOCAL = 16, RECT_PLUGIN = 32, - RECT_ALL = 63, - RECT_MAX + RECT_ALL = 63 }; enum RecDataT http://git-wip-us.apache.org/repos/asf/trafficserver/blob/be7eeac8/lib/records/P_RecCore.cc ---------------------------------------------------------------------- diff --git a/lib/records/P_RecCore.cc b/lib/records/P_RecCore.cc index b8498e4..3168741 100644 --- a/lib/records/P_RecCore.cc +++ b/lib/records/P_RecCore.cc @@ -420,7 +420,6 @@ RecSetRecord(RecT rec_type, const char *name, RecDataT data_type, RecData *data, break; } } - g_num_update[r1->rec_type]++; if (RecDataSet(data_type, &(r1->data), data)) { r1->sync_required = REC_SYNC_REQUIRED; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/be7eeac8/lib/records/P_RecCore.h ---------------------------------------------------------------------- diff --git a/lib/records/P_RecCore.h b/lib/records/P_RecCore.h index 63109f6..bda0103 100644 --- a/lib/records/P_RecCore.h +++ b/lib/records/P_RecCore.h @@ -39,7 +39,6 @@ extern RecRecord *g_records; extern InkHashTable *g_records_ht; extern ink_rwlock g_records_rwlock; extern int g_num_records; -extern int g_num_update[]; extern RecModeT g_mode_type; extern RecTree *g_records_tree; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/be7eeac8/lib/records/RecCore.cc ---------------------------------------------------------------------- diff --git a/lib/records/RecCore.cc b/lib/records/RecCore.cc index 01d146c..9582312 100644 --- a/lib/records/RecCore.cc +++ b/lib/records/RecCore.cc @@ -36,8 +36,6 @@ InkHashTable *g_records_ht = NULL; ink_rwlock g_records_rwlock; int g_num_records = 0; -int g_num_update[RECT_MAX]; - RecTree *g_records_tree = NULL; //------------------------------------------------------------------------- @@ -204,10 +202,6 @@ RecCoreInit(RecModeT mode_type, Diags *_diags) } } - for (int i = 0; i < RECT_MAX; i++) { - g_num_update[i] = 0; - } - g_initialized = true; return REC_ERR_OKAY; @@ -496,12 +490,6 @@ RecGetRecordPersistenceType(const char *name, RecPersistT * persist_type, bool l } int -RecGetRecordUpdateCount(RecT data_type) -{ - return g_num_update[data_type]; -} - -int RecGetRecordOrderAndId(const char *name, int* order, int* id, bool lock) { int err = REC_ERR_FAIL; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/be7eeac8/proxy/api/ts/ts.h.in ---------------------------------------------------------------------- diff --git a/proxy/api/ts/ts.h.in b/proxy/api/ts/ts.h.in index 21ce25b..faaf34f 100644 --- a/proxy/api/ts/ts.h.in +++ b/proxy/api/ts/ts.h.in @@ -571,8 +571,7 @@ extern "C" TS_RECORDTYPE_CLUSTER = 8, TS_RECORDTYPE_LOCAL = 16, TS_RECORDTYPE_PLUGIN = 32, - TS_RECORDTYPE_ALL = 63, - TS_RECORDTYPE_MAX + TS_RECORDTYPE_ALL = 63 } TSRecordType; /* The values of this enum must match enum RecDataT in I_RecDefs.h */
