PIG-4951: Rename PIG_ATS_ENABLED constant
git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1763640 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index b711d6b..6193c9d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -48,6 +48,8 @@
BUG FIXES
+PIG-4951: Rename PIG_ATS_ENABLED constant (szita via daijy)
+
PIG-3087: Refactor TestLogicalPlanBuilder to be meaningful (szita via daijy)
PIG-4976: streaming job with store clause stuck if the script fail (daijy via knoguchi)
diff --git a/src/org/apache/pig/PigConfiguration.java b/src/org/apache/pig/PigConfiguration.java
index a5e7ed6..36adb2c 100644
--- a/src/org/apache/pig/PigConfiguration.java
+++ b/src/org/apache/pig/PigConfiguration.java
@@ -427,15 +427,25 @@
/**
* 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";
+
+ /**
+ * @deprecated use {@link #PIG_LOG_TRACE_ID} instead. Will be removed in Pig 0.18
+ */
+ public static final String CALLER_ID = PIG_LOG_TRACE_ID;
/**
* Enable ATS for Pig
*/
- public static final String ENABLE_ATS = "pig.ats.enabled";
+ public static final String PIG_ATS_ENABLED = "pig.ats.enabled";
/**
- * Enable ATS for Pig
+ * @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";
diff --git a/src/org/apache/pig/PigServer.java b/src/org/apache/pig/PigServer.java
index 6500d9c..fe09d2f 100644
--- a/src/org/apache/pig/PigServer.java
+++ b/src/org/apache/pig/PigServer.java
@@ -246,13 +246,13 @@
// 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);
