Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimizes opt* functions #337

Merged
merged 12 commits into from
May 23, 2017
Merged

Optimizes opt* functions #337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a8d4e47
adjustments to opt methods in reference to https://github.com/stleary…
May 16, 2017
bd4b180
Support for float to BigDecimal in optBigDecimal
May 17, 2017
c46774c
* Update opt* methods for JSONArray
May 17, 2017
fcdb867
grr, forgot to save changes on last commit
May 17, 2017
0c7bd72
fixes for javadoc
May 17, 2017
382f62e
* Prevent exceptions in cases where the value is not a string.
May 18, 2017
c28a2bd
* reverts changes to getDouble and related optDouble and optFloat
May 18, 2017
1ab5260
* Adds methods getNUmber and getFloat to JSONArray and JSONObject
May 18, 2017
a7f8ff2
correct string check for JSONObject optBigDecimal and optBigInteger
May 18, 2017
849b392
updates the getNumber/optNumber to not return invalid Doubles
May 18, 2017
04d6e83
* Missed JSONArray optFloat and optDouble for the revert
May 19, 2017
757b6ed
Merge branch 'master' of github.com:stleary/JSON-java into OptimizeOpt
May 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion JSONArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,11 @@ public BigInteger optBigInteger(int index, BigInteger defaultValue) {
return BigInteger.valueOf(((Number) val).longValue());
}
try {
return new BigDecimal(val.toString()).toBigInteger();
final String valStr = val.toString();
if(JSONObject.isDecimalNotation(valStr)) {
return new BigDecimal(valStr).toBigInteger();
}
return new BigInteger(valStr);
} catch (Exception e) {
return defaultValue;
}
Expand Down
78 changes: 49 additions & 29 deletions JSONObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,11 @@ public BigInteger optBigInteger(String key, BigInteger defaultValue) {
// jo.optInt("double"); -- will return 1, not an error
// this conversion to BigDecimal then to BigInteger is to maintain
// that type cast support that may truncate the decimal.
return new BigDecimal(val.toString()).toBigInteger();
final String valStr = val.toString();
if(isDecimalNotation(valStr)) {
return new BigDecimal(valStr).toBigInteger();
}
return new BigInteger(valStr);
} catch (Exception e) {
return defaultValue;
}
Expand Down Expand Up @@ -1759,12 +1763,22 @@ public boolean similar(Object other) {
return false;
}
}


/**
* Tests if the value should be tried as a decimal. It makes no test if there are actual digits.
*
* @param val value to test
* @return true if the string is "-0" or if it contains '.', 'e', or 'E', false otherwise.
*/
protected static boolean isDecimalNotation(final String val) {
return val.indexOf('.') > -1 || val.indexOf('e') > -1
|| val.indexOf('E') > -1 || "-0".equals(val);
}

Copy link

@guidomedina guidomedina May 19, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice "quick and dirty" function, what happens if running on a server with a different locale?

Anyway the following example can help:

static final char MINUS_SIGN;
static final char DECIMAL_SEPARATOR;
  
static {
   final DecimalFormatSymbols currentLocaleSymbols = DecimalFormatSymbols.getInstance();
   MINUS_SIGN = currentLocaleSymbols.getMinusSign();
   DECIMAL_SEPARATOR = currentLocaleSymbols.getDecimalSeparator();
}

Copy link

@guidomedina guidomedina May 19, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Though I'm not sure what should be done if the decimal separator for the server locale is a comma, not sure how the parse function will behave, might not be worth the effort in supporting this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are not looking for any number, we are looking for JSON numbers, which are not locale dependent.

Copy link

@guidomedina guidomedina May 19, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found it, ignore this completely, FloatingDecimal line 198 & 224:

46 = dot

if(var4 != 46) {
  break;
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from BigDecimal:

                    } else if (c == '.') {   // have dot
                        // have dot
                        if (dot) // two dots
                            throw new NumberFormatException();
                        dot = true;

Double.parse is similar.

/**
* Converts a string to a number using the narrowest possible type. Possible
* returns for this function are BigDecimal, Double, BigInteger, Long, and Integer.
*
* An Exception is thrown if
* When a Double is returned, it should always be a valid Double and not NaN or +-infinity.
*
* @param val value to convert
* @return Number representation of the value.
Expand All @@ -1775,46 +1789,52 @@ protected static Number stringToNumber(final String val) throws NumberFormatExce
char initial = val.charAt(0);
if ((initial >= '0' && initial <= '9') || initial == '-') {
// decimal representation
if (val.indexOf('.') > -1 || val.indexOf('e') > -1
|| val.indexOf('E') > -1
|| "-0".equals(val)) {
if (isDecimalNotation(val)) {
// quick dirty way to see if we need a BigDecimal instead of a Double
// this only handles some cases of overflow or underflow
if (val.length()>14) {
return new BigDecimal(val);
}
return Double.valueOf(val);
final Double d = Double.valueOf(val);
if (d.isInfinite() || d.isNaN()) {
// if we can't parse it as a double, go up to BigDecimal
// this is probably due to underflow like 4.32e-678
// or overflow like 4.65e5324. The size of the string is small
// but can't be held in a Double.
return new BigDecimal(val);
}
return d;
}
// integer representation.
// This will narrow any values to the smallest reasonable Object representation
// (Integer, Long, or BigInteger)

// string version
// The compare string length method reduces GC,
// but leads to smaller integers being placed in larger wrappers even though not
// needed. i.e. 1,000,000,000 -> Long even though it's an Integer
// 1,000,000,000,000,000,000 -> BigInteger even though it's a Long

// string version
if(val.length()<=9){
return Integer.valueOf(val);
}
if(val.length()<=18){
return Long.valueOf(val);
}
return new BigInteger(val);
//if(val.length()<=9){
// return Integer.valueOf(val);
//}
//if(val.length()<=18){
// return Long.valueOf(val);
//}
//return new BigInteger(val);

// BigInteger version: We use a similar bitLenth compare as
// BigInteger#intValueExact uses. Increases GC, but objects hold
// only what they need. i.e. Less runtime overhead if the value is
// long lived. Which is the better tradeoff? This is closer to what's
// in stringToValue.

//BigInteger bi = new BigInteger((String)val);
//if(bi.bitLength()<=31){
// return Integer.valueOf(bi.intValue());
//}
//if(bi.bitLength()<=63){
// return Long.valueOf(bi.longValue());
//}
//return bi;
BigInteger bi = new BigInteger(val);
if(bi.bitLength()<=31){
return Integer.valueOf(bi.intValue());
}
if(bi.bitLength()<=63){
return Long.valueOf(bi.longValue());
}
return bi;
}
throw new NumberFormatException("val ["+val+"] is not a valid number.");
}
Expand Down Expand Up @@ -1849,9 +1869,9 @@ public static Object stringToValue(String string) {
char initial = string.charAt(0);
if ((initial >= '0' && initial <= '9') || initial == '-') {
try {
if (string.indexOf('.') > -1 || string.indexOf('e') > -1
|| string.indexOf('E') > -1
|| "-0".equals(string)) {
// if we want full Big Number support this block can be replaced with:
// return stringToNumber(string);
if (isDecimalNotation(string)) {
Double d = Double.valueOf(string);
if (!d.isInfinite() && !d.isNaN()) {
return d;
Expand Down