Changeset: 5ec116ba7d71 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/5ec116ba7d71
Modified Files:
src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
Branch: default
Log Message:
When single character use faster version of indexOf(<char>)
diffs (82 lines):
diff --git a/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
b/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
@@ -208,7 +208,7 @@ public class MonetConnection extends Mon
String fname = props.getProperty("logfile",
"monet_" +
System.currentTimeMillis() + ".log");
File f = new File(fname);
- int ext = fname.lastIndexOf(".");
+ int ext = fname.lastIndexOf('.');
if (ext < 0) ext = fname.length();
String pre = fname.substring(0, ext);
String suf = fname.substring(ext);
diff --git a/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
b/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
@@ -3621,7 +3621,7 @@ public class MonetDatabaseMetaData exten
int major = 0;
if (env_monet_version != null) {
try {
- int start = env_monet_version.indexOf(".");
+ int start = env_monet_version.indexOf('.');
major = Integer.parseInt((start >= 0) ?
env_monet_version.substring(0, start) : env_monet_version);
} catch (NumberFormatException e) {
// ignore
@@ -3643,10 +3643,10 @@ public class MonetDatabaseMetaData exten
int minor = 0;
if (env_monet_version != null) {
try {
- int start = env_monet_version.indexOf(".");
+ int start = env_monet_version.indexOf('.');
if (start >= 0) {
start++;
- int end =
env_monet_version.indexOf(".", start);
+ int end =
env_monet_version.indexOf('.', start);
minor = Integer.parseInt((end > 0) ?
env_monet_version.substring(start, end) : env_monet_version.substring(start));
}
} catch (NumberFormatException e) {
diff --git a/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
b/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
@@ -156,7 +156,7 @@ final public class MonetDriver implement
// handle additional arguments
String args[] = uri_query.split("&");
for (int i = 0; i < args.length; i++) {
- tmp = args[i].indexOf("=");
+ tmp = args[i].indexOf('=');
if (tmp > 0)
info.put(args[i].substring(0, tmp),
args[i].substring(tmp + 1));
}
diff --git a/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
b/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
@@ -1055,7 +1055,7 @@ public class MonetPreparedStatement
// this to the exact number "0".) Also strip off trailing
// numbers that are inherent to the double representation.
String xStr = x.toPlainString();
- int dot = xStr.indexOf(".");
+ int dot = xStr.indexOf('.');
if (dot >= 0)
xStr = xStr.substring(0, Math.min(xStr.length(), dot + 1 +
scale[i]));
while (xStr.startsWith("0") && xStr.length() > 1)
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
@@ -1481,7 +1481,7 @@ public class MonetResultSet extends Mone
try {
schema = header.getTableNames()[column
- 1];
if (schema != null) {
- int dot = schema.indexOf(".");
+ int dot = schema.indexOf('.');
return (dot >= 0) ?
schema.substring(0, dot) : "";
}
} catch (IndexOutOfBoundsException e) {
@@ -1508,7 +1508,7 @@ public class MonetResultSet extends Mone
try {
table = header.getTableNames()[column -
1];
if (table != null) {
- int dot = table.indexOf(".");
+ int dot = table.indexOf('.');
return (dot >= 0) ?
table.substring(dot + 1) : table;
}
} catch (IndexOutOfBoundsException e) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
