You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2016/10/06 19:13:05 UTC
svn commit: r1763641 - in /pig/branches/branch-0.16: CHANGES.txt
src/org/apache/pig/PigConfiguration.java src/org/apache/pig/PigServer.java
Author: daijy
Date: Thu Oct 6 19:13:05 2016
New Revision: 1763641
URL: http://svn.apache.org/viewvc?rev=1763641&view=rev
Log:
PIG-4951: Rename PIG_ATS_ENABLED constant
Modified:
pig/branches/branch-0.16/CHANGES.txt
pig/branches/branch-0.16/src/org/apache/pig/PigConfiguration.java
pig/branches/branch-0.16/src/org/apache/pig/PigServer.java
Modified: pig/branches/branch-0.16/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.16/CHANGES.txt?rev=1763641&r1=1763640&r2=1763641&view=diff
==============================================================================
--- pig/branches/branch-0.16/CHANGES.txt (original)
+++ pig/branches/branch-0.16/CHANGES.txt Thu Oct 6 19:13:05 2016
@@ -30,6 +30,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-4951: Rename PIG_ATS_ENABLED constant (szita via daijy)
+
PIG-5035: killJob API does not work in Tez (zjffdu via rohini)
PIG-5032: Output record stats in Tez is wrong when there is split followed by union (rohini)
Modified: pig/branches/branch-0.16/src/org/apache/pig/PigConfiguration.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.16/src/org/apache/pig/PigConfiguration.java?rev=1763641&r1=1763640&r2=1763641&view=diff
==============================================================================
--- pig/branches/branch-0.16/src/org/apache/pig/PigConfiguration.java (original)
+++ pig/branches/branch-0.16/src/org/apache/pig/PigConfiguration.java Thu Oct 6 19:13:05 2016
@@ -421,16 +421,26 @@ public class PigConfiguration {
/**
* Log tracing id that can be used by upstream clients for tracking respective logs
*/
- public static final String CALLER_ID = "pig.log.trace.id";
+ public static final String PIG_LOG_TRACE_ID = "pig.log.trace.id";
/**
- * Enable ATS for Pig
+ * @deprecated use {@link #PIG_LOG_TRACE_ID} instead. Will be removed in Pig 0.18
*/
- public static final String ENABLE_ATS = "pig.ats.enabled";
+ public static final String CALLER_ID = PIG_LOG_TRACE_ID;
/**
* Enable ATS for Pig
*/
+ public static final String PIG_ATS_ENABLED = "pig.ats.enabled";
+
+ /**
+ * @deprecated use {@link #PIG_ATS_ENABLED} instead. Will be removed in Pig 0.18
+ */
+ public static final String ENABLE_ATS = PIG_ATS_ENABLED;
+
+ /**
+ * If set, Pig will override tez.am.launch.cmd-opts and tez.am.resource.memory.mb to optimal
+ */
public static final String PIG_TEZ_CONFIGURE_AM_MEMORY = "pig.tez.configure.am.memory";
// Deprecated settings of Pig 0.13
Modified: pig/branches/branch-0.16/src/org/apache/pig/PigServer.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.16/src/org/apache/pig/PigServer.java?rev=1763641&r1=1763640&r2=1763641&view=diff
==============================================================================
--- pig/branches/branch-0.16/src/org/apache/pig/PigServer.java (original)
+++ pig/branches/branch-0.16/src/org/apache/pig/PigServer.java Thu Oct 6 19:13:05 2016
@@ -246,13 +246,13 @@ public class PigServer {
// log ATS event includes the caller context
String auditId = PigATSClient.getPigAuditId(pigContext);
- String callerId = (String)pigContext.getProperties().get(PigConfiguration.CALLER_ID);
+ String callerId = (String)pigContext.getProperties().get(PigConfiguration.PIG_LOG_TRACE_ID);
log.info("Pig Script ID for the session: " + auditId);
if (callerId != null) {
log.info("Caller ID for session: " + callerId);
}
if (Boolean.parseBoolean(pigContext.getProperties()
- .getProperty(PigConfiguration.ENABLE_ATS))) {
+ .getProperty(PigConfiguration.PIG_ATS_ENABLED))) {
if (Boolean.parseBoolean(pigContext.getProperties()
.getProperty("yarn.timeline-service.enabled", "false"))) {
PigATSClient.ATSEvent event = new PigATSClient.ATSEvent(auditId, callerId);