chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r786698 - in /hadoop/chukwa: branches/chukwa-0.2/ branches/chukwa-0.2/conf/ branches/chukwa-0.2/src/java/org/apache/hadoop/chukwa/dataloader/ trunk/ trunk/conf/ trunk/src/java/org/apache/hadoop/chukwa/dataloader/
Date Fri, 19 Jun 2009 22:46:46 GMT
Author: eyang
Date: Fri Jun 19 22:46:45 2009
New Revision: 786698

URL: http://svn.apache.org/viewvc?rev=786698&view=rev
Log:
CHUKWA-316. Added explicit rule for MetricDataLoader to prevent loading of data. (Eric Yang)

Modified:
    hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt
    hadoop/chukwa/branches/chukwa-0.2/conf/mdl.xml
    hadoop/chukwa/branches/chukwa-0.2/src/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoader.java
    hadoop/chukwa/trunk/CHANGES.txt
    hadoop/chukwa/trunk/conf/mdl.xml
    hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoader.java

Modified: hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt?rev=786698&r1=786697&r2=786698&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt (original)
+++ hadoop/chukwa/branches/chukwa-0.2/CHANGES.txt Fri Jun 19 22:46:45 2009
@@ -66,6 +66,8 @@
 
   BUG FIXES
 
+    CHUKWA-316. Added explicit rule for MetricDataLoader to prevent loading of data. (Eric
Yang)
+
     CHUKWA-312. Fixed chukwa-pig.jar class path for pig aggregation. (Cheng Zhang via Eric
Yang)
 
     CHUKWA-314. Added filtering for start_time to remove invalid value. (Jerome Boulon via
Eric Yang)

Modified: hadoop/chukwa/branches/chukwa-0.2/conf/mdl.xml
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.2/conf/mdl.xml?rev=786698&r1=786697&r2=786698&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.2/conf/mdl.xml (original)
+++ hadoop/chukwa/branches/chukwa-0.2/conf/mdl.xml Fri Jun 19 22:46:45 2009
@@ -1374,6 +1374,12 @@
   <name>metric.jobdata.jobconf-json</name>
   <value>jobconf</value>
 </property>
+
+<property>
+  <name>metric.jobdata.jobconf</name>
+  <value></value>
+  <description>Explicitly undefined jobconf path to load to database</description>
+</property>
   
 <property>
   <name>metric.jobdata.finished_maps</name>

Modified: hadoop/chukwa/branches/chukwa-0.2/src/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoader.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.2/src/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoader.java?rev=786698&r1=786697&r2=786698&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.2/src/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoader.java
(original)
+++ hadoop/chukwa/branches/chukwa-0.2/src/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoader.java
Fri Jun 19 22:46:45 2009
@@ -351,7 +351,7 @@
           boolean firstValue = true;
           while (fi.hasNext()) {
             String fieldKey = fi.next();
-            if (transformer.containsKey(fieldKey)) {
+            if (transformer.containsKey(fieldKey) && transformer.get(fieldKey).intern()!="".intern())
{
               if (!firstValue) {
                 sqlValues.append(", ");
               }

Modified: hadoop/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/CHANGES.txt?rev=786698&r1=786697&r2=786698&view=diff
==============================================================================
--- hadoop/chukwa/trunk/CHANGES.txt (original)
+++ hadoop/chukwa/trunk/CHANGES.txt Fri Jun 19 22:46:45 2009
@@ -66,6 +66,8 @@
 
   BUG FIXES
 
+    CHUKWA-316. Added explicit rule for MetricDataLoader to prevent loading of data. (Eric
Yang)
+
     CHUKWA-42. Clean up logging of adaptor creation. (Ari Rabkin)
 
     CHUKWA-312. Fixed chukwa-pig.jar class path for pig aggregation. (Cheng Zhang via Eric
Yang)

Modified: hadoop/chukwa/trunk/conf/mdl.xml
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/conf/mdl.xml?rev=786698&r1=786697&r2=786698&view=diff
==============================================================================
--- hadoop/chukwa/trunk/conf/mdl.xml (original)
+++ hadoop/chukwa/trunk/conf/mdl.xml Fri Jun 19 22:46:45 2009
@@ -1374,6 +1374,12 @@
   <name>metric.jobdata.jobconf-json</name>
   <value>jobconf</value>
 </property>
+
+<property>
+  <name>metric.jobdata.jobconf</name>
+  <value></value>
+  <description>Explicitly undefined jobconf path to load to database</description>
+</property>
   
 <property>
   <name>metric.jobdata.finished_maps</name>

Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoader.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoader.java?rev=786698&r1=786697&r2=786698&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoader.java
(original)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/dataloader/MetricDataLoader.java
Fri Jun 19 22:46:45 2009
@@ -351,7 +351,7 @@
           boolean firstValue = true;
           while (fi.hasNext()) {
             String fieldKey = fi.next();
-            if (transformer.containsKey(fieldKey)) {
+            if (transformer.containsKey(fieldKey) && transformer.get(fieldKey).intern()!="".intern())
{
               if (!firstValue) {
                 sqlValues.append(", ");
               }



Mime
View raw message