diff options
| -rw-r--r-- | cmds/statsd/src/stats_log_util.cpp | 25 | ||||
| -rw-r--r-- | tools/stats_log_api_gen/Collation.cpp | 7 | ||||
| -rw-r--r-- | tools/stats_log_api_gen/Collation.h | 2 | ||||
| -rw-r--r-- | tools/stats_log_api_gen/atoms_info_writer.cpp | 32 |
4 files changed, 2 insertions, 64 deletions
diff --git a/cmds/statsd/src/stats_log_util.cpp b/cmds/statsd/src/stats_log_util.cpp index 3d02ffb0db75..77a3eb31fdd4 100644 --- a/cmds/statsd/src/stats_log_util.cpp +++ b/cmds/statsd/src/stats_log_util.cpp @@ -357,30 +357,7 @@ void writeFieldValueTreeToStreamHelper(int tagId, const std::vector<FieldValue>& protoOutput->write(FIELD_TYPE_FLOAT | fieldNum, dim.mValue.float_value); break; case STRING: { - bool isBytesField = false; - // Bytes field is logged via string format in log_msg format. So here we check - // if this string field is a byte field. - std::map<int, std::vector<int>>::const_iterator itr; - if (depth == 0 && (itr = AtomsInfo::kBytesFieldAtoms.find(tagId)) != - AtomsInfo::kBytesFieldAtoms.end()) { - const std::vector<int>& bytesFields = itr->second; - for (int bytesField : bytesFields) { - if (bytesField == fieldNum) { - // This is a bytes field - isBytesField = true; - break; - } - } - } - if (isBytesField) { - if (dim.mValue.str_value.length() > 0) { - protoOutput->write(FIELD_TYPE_MESSAGE | fieldNum, - (const char*)dim.mValue.str_value.c_str(), - dim.mValue.str_value.length()); - } - } else { - protoOutput->write(FIELD_TYPE_STRING | fieldNum, dim.mValue.str_value); - } + protoOutput->write(FIELD_TYPE_STRING | fieldNum, dim.mValue.str_value); break; } case STORAGE: diff --git a/tools/stats_log_api_gen/Collation.cpp b/tools/stats_log_api_gen/Collation.cpp index f31a2af87b2b..47eb63e823e7 100644 --- a/tools/stats_log_api_gen/Collation.cpp +++ b/tools/stats_log_api_gen/Collation.cpp @@ -55,8 +55,7 @@ AtomDecl::AtomDecl(const AtomDecl &that) resetState(that.resetState), nested(that.nested), uidField(that.uidField), - whitelisted(that.whitelisted), - binaryFields(that.binaryFields) {} + whitelisted(that.whitelisted) {} AtomDecl::AtomDecl(int c, const string& n, const string& m) :code(c), @@ -422,10 +421,6 @@ int collate_atom(const Descriptor *atom, AtomDecl *atomDecl, continue; } } - // Binary field validity is already checked above. - if (isBinaryField) { - atomDecl->binaryFields.push_back(it->first); - } } return errorCount; diff --git a/tools/stats_log_api_gen/Collation.h b/tools/stats_log_api_gen/Collation.h index d99b931338f2..c6dad1d07d89 100644 --- a/tools/stats_log_api_gen/Collation.h +++ b/tools/stats_log_api_gen/Collation.h @@ -147,8 +147,6 @@ struct AtomDecl { bool whitelisted = false; - vector<int> binaryFields; - AtomDecl(); AtomDecl(const AtomDecl& that); AtomDecl(int code, const string& name, const string& message); diff --git a/tools/stats_log_api_gen/atoms_info_writer.cpp b/tools/stats_log_api_gen/atoms_info_writer.cpp index 58f13a4c1934..4f66f68e6d8c 100644 --- a/tools/stats_log_api_gen/atoms_info_writer.cpp +++ b/tools/stats_log_api_gen/atoms_info_writer.cpp @@ -48,9 +48,6 @@ static void write_atoms_info_header_body(FILE* out, const Atoms& atoms) { " const static std::map<int, StateAtomFieldOptions> " "kStateAtomsFieldOptions;\n"); fprintf(out, - " const static std::map<int, std::vector<int>> " - "kBytesFieldAtoms;\n"); - fprintf(out, " const static std::set<int> kWhitelistedAtoms;\n"); fprintf(out, "};\n"); fprintf(out, "const static int kMaxPushedAtomId = %d;\n\n", atoms.maxPushedAtomId); @@ -175,35 +172,6 @@ static void write_atoms_info_cpp_body(FILE* out, const Atoms& atoms) { "const std::map<int, StateAtomFieldOptions> " "AtomsInfo::kStateAtomsFieldOptions = " "getStateAtomFieldOptions();\n"); - - fprintf(out, - "static std::map<int, std::vector<int>> " - "getBinaryFieldAtoms() {\n"); - fprintf(out, " std::map<int, std::vector<int>> options;\n"); - for (set<AtomDecl>::const_iterator atom = atoms.decls.begin(); - atom != atoms.decls.end(); atom++) { - if (atom->binaryFields.size() == 0) { - continue; - } - fprintf(out, - "\n // Adding binary fields for atom " - "(%d)%s\n", - atom->code, atom->name.c_str()); - - for (const auto& field : atom->binaryFields) { - fprintf(out, " options[%d /* %s */].push_back(%d);\n", - atom->code, make_constant_name(atom->name).c_str(), field); - } - } - - fprintf(out, " return options;\n"); - fprintf(out, "}\n"); - - fprintf(out, - "const std::map<int, std::vector<int>> " - "AtomsInfo::kBytesFieldAtoms = " - "getBinaryFieldAtoms();\n"); - } int write_atoms_info_header(FILE* out, const Atoms &atoms, const string& namespaceStr) { |