Changeset: 01b9672e9308 for monetdb-java
URL: http://dev.monetdb.org/hg/monetdb-java?cmd=changeset;node=01b9672e9308
Modified Files:
src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
Branch: default
Log Message:
Improved speed of ResultSet.getLong().
It now does the check on whether the MonetDB column type is "oid" only when a
NumberFormatException occurs.
As the oid type is rarely used in SQL tables, this should speed up getLong
retrievals from BIGINT columns.
Added this special oid handling functionality now also to getInt(), so it can
now successfully retrieve values from an oid column.
diffs (104 lines):
diff --git a/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
b/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
@@ -1122,8 +1122,7 @@ public class MonetResultSet extends Mone
* ResultSet object as a float in the Java programming language.
*
* @param columnName the SQL name of the column
- * @return the column value; if the value is SQL NULL, the value
returned
- * is 0
+ * @return the column value; if the value is SQL NULL, the value
returned is 0
* @throws SQLException if the ResultSet object does not contain
columnName
*/
@Override
@@ -1136,14 +1135,14 @@ public class MonetResultSet extends Mone
* ResultSet object as an int in the Java programming language.
*
* @param columnIndex the first column is 1, the second is 2, ...
- * @return the column value; if the value is SQL NULL, the value
returned
- * is 0
+ * @return the column value; if the value is SQL NULL, the value
returned is 0
* @throws SQLException if there is no such column
*/
@Override
public int getInt(int columnIndex) throws SQLException {
+ String val = "";
try {
- String val = tlp.values[columnIndex - 1];
+ val = tlp.values[columnIndex - 1];
if (val == null) {
lastReadWasNull = true;
return 0;
@@ -1151,6 +1150,19 @@ public class MonetResultSet extends Mone
lastReadWasNull = false;
return Integer.parseInt(val);
} catch (NumberFormatException e) {
+ // The oid datatype values (as string) have a @0
suffix in the string value.
+ // To allow succesful parsing and conversion to int, we
need to remove the suffix first
+ if ("oid".equals(types[columnIndex - 1])) {
+ int len = val.length();
+ if (len > 2 && val.endsWith("@0")) {
+ val = val.substring(0, len-2);
+ try {
+ return Integer.parseInt(val);
+ } catch (NumberFormatException nfe) {
+ throw
newSQLNumberFormatException(nfe);
+ }
+ }
+ }
throw newSQLNumberFormatException(e);
} catch (IndexOutOfBoundsException e) {
throw newSQLInvalidColumnIndexException(columnIndex);
@@ -1162,8 +1174,7 @@ public class MonetResultSet extends Mone
* ResultSet object as an int in the Java programming language.
*
* @param columnName the SQL name of the column
- * @return the column value; if the value is SQL NULL, the value
returned
- * is 0
+ * @return the column value; if the value is SQL NULL, the value
returned is 0
* @throws SQLException if the ResultSet object does not contain
columnName
*/
@Override
@@ -1176,29 +1187,34 @@ public class MonetResultSet extends Mone
* ResultSet object as a long in the Java programming language.
*
* @param columnIndex the first column is 1, the second is 2, ...
- * @return the column value; if the value is SQL NULL, the value
returned
- * is 0
+ * @return the column value; if the value is SQL NULL, the value
returned is 0
* @throws SQLException if there is no such column
*/
@Override
public long getLong(int columnIndex) throws SQLException {
+ String val = "";
try {
- String val = tlp.values[columnIndex - 1];
+ val = tlp.values[columnIndex - 1];
if (val == null) {
lastReadWasNull = true;
return 0;
}
lastReadWasNull = false;
-
+ return Long.parseLong(val);
+ } catch (NumberFormatException e) {
// The oid datatype values (as string) have a @0
suffix in the string value.
- // To allow succesful parsing and conversion to long,
we need to remove it first
+ // To allow succesful parsing and conversion to long,
we need to remove the suffix first
if ("oid".equals(types[columnIndex - 1])) {
int len = val.length();
- if (len > 2 && val.endsWith("@0"))
+ if (len > 2 && val.endsWith("@0")) {
val = val.substring(0, len-2);
+ try {
+ return Long.parseLong(val);
+ } catch (NumberFormatException nfe) {
+ throw
newSQLNumberFormatException(nfe);
+ }
+ }
}
- return Long.parseLong(val);
- } catch (NumberFormatException e) {
throw newSQLNumberFormatException(e);
} catch (IndexOutOfBoundsException e) {
throw newSQLInvalidColumnIndexException(columnIndex);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
