[
https://issues.apache.org/jira/browse/HADOOP-17276?focusedWorklogId=493609&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-493609
]
ASF GitHub Bot logged work on HADOOP-17276:
-------------------------------------------
Author: ASF GitHub Bot
Created on: 01/Oct/20 17:43
Start Date: 01/Oct/20 17:43
Worklog Time Spent: 10m
Work Description: goiri commented on a change in pull request #2327:
URL: https://github.com/apache/hadoop/pull/2327#discussion_r498413903
##########
File path:
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/CallerContext.java
##########
@@ -109,11 +114,53 @@ public String toString() {
/** The caller context builder. */
public static final class Builder {
- private final String context;
+ private static final String KEY_VALUE_SEPARATOR = ":";
+ /**
+ * The illegal separators include '\t', '\n', '='.
+ * User should not set illegal separator.
+ */
+ private static final List<String> ILLEGAL_SEPARATORS =
+ Arrays.asList("\t","\n","=");
+ private final String fieldSeparator;
+ private final StringBuilder sb = new StringBuilder();
private byte[] signature;
public Builder(String context) {
- this.context = context;
+ this(context, new Configuration());
+ }
+
+ public Builder(String context, Configuration conf) {
+ if (isValid(context)) {
+ sb.append(context);
+ }
+ fieldSeparator = conf.get(HADOOP_CALLER_CONTEXT_SEPARATOR_KEY,
+ HADOOP_CALLER_CONTEXT_SEPARATOR_DEFAULT);
+ checkFieldSeparator(fieldSeparator);
+ }
+
+ /**
+ * Check whether the separator is legal.
+ * The illegal separators include '\t', '\n', '='.
+ * Throw IllegalArgumentException if the separator is Illegal.
+ * @param separator the separator of fields.
+ */
+ private void checkFieldSeparator(String separator) {
+ if (ILLEGAL_SEPARATORS.stream()
Review comment:
Not that is wrong, but we could just do:
ILLEGAL_SEPARATORS.contains(separator), and if we make it a HashSet would be
faster.
##########
File path:
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/CallerContext.java
##########
@@ -114,6 +115,12 @@ public String toString() {
/** The caller context builder. */
public static final class Builder {
private static final String KEY_VALUE_SEPARATOR = ":";
+ /**
+ * The illegal separators include '\t', '\n', '=', etc.
+ * User should not set illegal separator.
+ */
+ private static final List<String> ILLEGAL_SEPARATORS =
+ Arrays.asList("\t","\n","=");
Review comment:
I would do a set: Collections.unmodifiableSet()
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 493609)
Time Spent: 7h 50m (was: 7h 40m)
> Extend CallerContext to make it include many items
> --------------------------------------------------
>
> Key: HADOOP-17276
> URL: https://issues.apache.org/jira/browse/HADOOP-17276
> Project: Hadoop Common
> Issue Type: Improvement
> Reporter: Hui Fei
> Assignee: Hui Fei
> Priority: Major
> Labels: pull-request-available
> Time Spent: 7h 50m
> Remaining Estimate: 0h
>
> Now context is string. We need to extend the CallerContext because context
> may contains many items.
> Items include
> * router ip
> * MR or CLI
> * etc
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
