github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#3225] Various optimisations

Browse Source
This commit is contained in:
Lukas Eder 2014-05-05 09:44:22 +02:00
parent f7beeab747
commit e8beadc6e7
3 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java
View File

@ -278,10 +278,14 @@ public class DefaultDataType<T> implements DataType<T> {
// Dialect-specific data types
int ordinal = dialect == null ? SQLDialect.SQL99.ordinal() : dialect.ordinal();
String normalised = DefaultDataType.normalise(typeName);
if (TYPES_BY_NAME[ordinal].get(normalised) == null) {
TYPES_BY_NAME[ordinal].put(normalised, this);
// [#3225] Avoid normalisation if not necessary
if (!TYPES_BY_NAME[ordinal].containsKey(typeName.toUpperCase())) {
String normalised = DefaultDataType.normalise(typeName);
if (TYPES_BY_NAME[ordinal].get(normalised) == null) {
TYPES_BY_NAME[ordinal].put(normalised, this);
}
}
if (TYPES_BY_TYPE[ordinal].get(type) == null) {
@ -620,12 +624,17 @@ public class DefaultDataType<T> implements DataType<T> {
}
public static DataType<?> getDataType(SQLDialect dialect, String typeName) {
String normalised = DefaultDataType.normalise(typeName);
DataType<?> result = TYPES_BY_NAME[dialect.ordinal()].get(normalised);
DataType<?> result = TYPES_BY_NAME[dialect.ordinal()].get(typeName.toUpperCase());
// [#3225] Normalise only if necessary
if (result == null) {
typeName = DefaultDataType.normalise(typeName);
result = TYPES_BY_NAME[dialect.ordinal()].get(typeName);
}
// UDT data types and others are registered using SQL99
if (result == null) {
result = TYPES_BY_NAME[SQLDialect.SQL99.ordinal()].get(normalised);
result = TYPES_BY_NAME[SQLDialect.SQL99.ordinal()].get(typeName);
}
if (result == null) {
@ -806,7 +815,7 @@ public class DefaultDataType<T> implements DataType<T> {
* Convert a type name (using precision and scale) into a Java class
*/
public static DataType<?> getDataType(SQLDialect dialect, String t, int p, int s) throws SQLDialectNotSupportedException {
DataType<?> result = DefaultDataType.getDataType(dialect, DefaultDataType.normalise(t));
DataType<?> result = DefaultDataType.getDataType(dialect, t);
if (result.getType() == BigDecimal.class) {
result = DefaultDataType.getDataType(dialect, getNumericClass(p, s));

14
jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
View File

@ -89,7 +89,7 @@ class DefaultRenderContext extends AbstractContext<RenderContext> implements Ren
private int params;
private int alias;
private int indent;
private Stack<Integer> indentLock = new Stack<Integer>();
private Stack<Integer> indentLock;
private int printMargin = 80;
// [#1632] Cached values from Settings
@ -295,10 +295,18 @@ class DefaultRenderContext extends AbstractContext<RenderContext> implements Ren
return this;
}
private Stack<Integer> indentLock() {
if (indentLock == null) {
indentLock = new Stack<Integer>();
}
return indentLock;
}
@Override
public final RenderContext formatIndentLockStart() {
if (cachedRenderFormatted) {
indentLock.push(indent);
indentLock().push(indent);
String[] lines = sql.toString().split("[\\n\\r]");
indent = lines[lines.length - 1].length();
}
@ -309,7 +317,7 @@ class DefaultRenderContext extends AbstractContext<RenderContext> implements Ren
@Override
public final RenderContext formatIndentLockEnd() {
if (cachedRenderFormatted) {
indent = indentLock.pop();
indent = indentLock().pop();
}
return this;

5
jOOQ/src/main/java/org/jooq/impl/SQLTemplate.java
View File

@ -87,5 +87,10 @@ class SQLTemplate implements Template {
public final Clause[] clauses(Context<?> ctx) {
return CLAUSES;
}
@Override
public String toString() {
return sql;
}
}
}