HADOOP-14673. Remove leftover hadoop_xml_escape from functions. Contributed by Ajay Kumar.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/04465113 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/04465113 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/04465113 Branch: refs/heads/HDFS-7240 Commit: 044651139800b9e2e5b8f224772e6dbd6ded58c6 Parents: 8bef4ec Author: Arpit Agarwal <a...@apache.org> Authored: Mon Aug 14 16:22:10 2017 -0700 Committer: Arpit Agarwal <a...@apache.org> Committed: Mon Aug 14 16:22:10 2017 -0700 ---------------------------------------------------------------------- .../src/main/bin/hadoop-functions.sh | 23 -------------- .../src/test/scripts/hadoop_escape_chars.bats | 32 -------------------- 2 files changed, 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/04465113/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh index 3cf21cf..9ea4587 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh @@ -2578,29 +2578,6 @@ function hadoop_parse_args hadoop_debug "hadoop_parse: asking caller to skip ${HADOOP_PARSE_COUNTER}" } -## @description XML-escapes the characters (&'"<>) in the given parameter. -## @audience private -## @stability evolving -## @replaceable yes -## @param string -## @return XML-escaped string -function hadoop_xml_escape -{ - sed -e 's/&/\&/g' -e 's/"/\\\"/g' \ - -e "s/'/\\\\\'/g" -e 's/</\\\</g' -e 's/>/\\\>/g' <<< "$1" -} - -## @description sed-escapes the characters (\/&) in the given parameter. -## @audience private -## @stability evolving -## @replaceable yes -## @param string -## @return sed-escaped string -function hadoop_sed_escape -{ - sed -e 's/[\/&]/\\&/g' <<< "$1" -} - ## @description Handle subcommands from main program entries ## @audience private ## @stability evolving http://git-wip-us.apache.org/repos/asf/hadoop/blob/04465113/hadoop-common-project/hadoop-common/src/test/scripts/hadoop_escape_chars.bats ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/scripts/hadoop_escape_chars.bats b/hadoop-common-project/hadoop-common/src/test/scripts/hadoop_escape_chars.bats deleted file mode 100755 index 9b031f2..0000000 --- a/hadoop-common-project/hadoop-common/src/test/scripts/hadoop_escape_chars.bats +++ /dev/null @@ -1,32 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -load hadoop-functions_test_helper - -@test "hadoop_escape_sed (positive 1)" { - ret="$(hadoop_sed_escape "\pass&&word\0#\$asdf/g ><'\"~\`!@#$%^&*()_+-=")" - expected="\\\\pass\&\&word\\\0#\$asdf\/g ><'\"~\`!@#$%^\&*()_+-=" - echo "actual >${ret}<" - echo "expected >${expected}<" - [ "${ret}" = "${expected}" ] -} - -@test "hadoop_escape_xml (positive 1)" { - ret="$(hadoop_xml_escape "\pass&&word\0#\$asdf/g ><'\"~\`!@#$%^&*()_+-=")" - expected="\\pass&&word\0#\$asdf/g \>\<\'\"~\`!@#\$%^&*()_+-=" - echo "actual >${ret}<" - echo "expected >${expected}<" - [ "${ret}" = "${expected}" ] -} \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
