svn merge --ignore-ancestry -c 1342501 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461718 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
f26fa51029
commit
2b856f04e2
|
@ -8,6 +8,9 @@ Release 2.0.5-beta - UNRELEASED
|
|||
|
||||
HADOOP-9283. Add support for running the Hadoop client on AIX. (atm)
|
||||
|
||||
HADOOP-8415. Add getDouble() and setDouble() in
|
||||
org.apache.hadoop.conf.Configuration (Jan van der Lugt via harsh)
|
||||
|
||||
IMPROVEMENTS
|
||||
|
||||
HADOOP-9253. Capture ulimit info in the logs at service start time.
|
||||
|
|
|
@ -1016,6 +1016,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
return defaultValue;
|
||||
return Float.parseFloat(valueString);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the value of the <code>name</code> property to a <code>float</code>.
|
||||
*
|
||||
|
@ -1026,6 +1027,35 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|||
set(name,Float.toString(value));
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the value of the <code>name</code> property as a <code>double</code>.
|
||||
* If no such property exists, the provided default value is returned,
|
||||
* or if the specified value is not a valid <code>double</code>,
|
||||
* then an error is thrown.
|
||||
*
|
||||
* @param name property name.
|
||||
* @param defaultValue default value.
|
||||
* @throws NumberFormatException when the value is invalid
|
||||
* @return property value as a <code>double</code>,
|
||||
* or <code>defaultValue</code>.
|
||||
*/
|
||||
public double getDouble(String name, double defaultValue) {
|
||||
String valueString = getTrimmed(name);
|
||||
if (valueString == null)
|
||||
return defaultValue;
|
||||
return Double.parseDouble(valueString);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the value of the <code>name</code> property to a <code>double</code>.
|
||||
*
|
||||
* @param name property name.
|
||||
* @param value property value.
|
||||
*/
|
||||
public void setDouble(String name, double value) {
|
||||
set(name,Double.toString(value));
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the value of the <code>name</code> property as a <code>boolean</code>.
|
||||
* If no such property is specified, or if the specified value is not a valid
|
||||
|
|
|
@ -579,6 +579,29 @@ public class TestConfiguration extends TestCase {
|
|||
}
|
||||
}
|
||||
|
||||
public void testDoubleValues() throws IOException {
|
||||
out=new BufferedWriter(new FileWriter(CONFIG));
|
||||
startConfig();
|
||||
appendProperty("test.double1", "3.1415");
|
||||
appendProperty("test.double2", "003.1415");
|
||||
appendProperty("test.double3", "-3.1415");
|
||||
appendProperty("test.double4", " -3.1415 ");
|
||||
appendProperty("test.double5", "xyz-3.1415xyz");
|
||||
endConfig();
|
||||
Path fileResource = new Path(CONFIG);
|
||||
conf.addResource(fileResource);
|
||||
assertEquals(3.1415, conf.getDouble("test.double1", 0.0));
|
||||
assertEquals(3.1415, conf.getDouble("test.double2", 0.0));
|
||||
assertEquals(-3.1415, conf.getDouble("test.double3", 0.0));
|
||||
assertEquals(-3.1415, conf.getDouble("test.double4", 0.0));
|
||||
try {
|
||||
conf.getDouble("test.double5", 0.0);
|
||||
fail("Property had invalid double value, but was read successfully.");
|
||||
} catch (NumberFormatException e) {
|
||||
// pass
|
||||
}
|
||||
}
|
||||
|
||||
public void testGetClass() throws IOException {
|
||||
out=new BufferedWriter(new FileWriter(CONFIG));
|
||||
startConfig();
|
||||
|
|
Loading…
Reference in New Issue