Skip to content
This repository was archived by the owner on Aug 15, 2024. It is now read-only.

Merge [CALCITE-3163] and [CALCITE-3162] #5

Merged
nouda merged 5 commits into from
Mar 30, 2020
Merged

Merge [CALCITE-3163] and [CALCITE-3162] #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e66afe1
[CALCITE-3163] AbstractCursor#convertValue() now adheres to JDBC spec…
Jul 1, 2019
29a3b8b
[CALCITE-3162] Fixed issue that arise when reading Arrays from Calcit…
Jul 3, 2019
23027e4
Fixed line length of comment.
Jul 3, 2019
0e1ebd1
Merge remote-tracking branch 'ppanopticon/avatica-convert-value-fix' …
nouda Mar 30, 2020
69838b0
Merge remote-tracking branch 'ppanopticon/avatica-jdbc-resultset-fix'…
nouda Mar 30, 2020
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
11 changes: 4 additions & 7 deletions core/src/main/java/org/apache/calcite/avatica/remote/TypedValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,16 +724,15 @@ public static Object getSerialFromProto(Common.TypedValue protoValue) {
return Float.intBitsToFloat((int) protoValue.getNumberValue());
case INTEGER:
case PRIMITIVE_INT:
case JAVA_SQL_DATE:
case JAVA_SQL_TIME:
return Long.valueOf(protoValue.getNumberValue()).intValue();
case PRIMITIVE_SHORT:
case SHORT:
return Long.valueOf(protoValue.getNumberValue()).shortValue();
case LONG:
case PRIMITIVE_LONG:
return Long.valueOf(protoValue.getNumberValue());
case JAVA_SQL_DATE:
case JAVA_SQL_TIME:
return Long.valueOf(protoValue.getNumberValue()).intValue();
case NUMBER:
case JAVA_SQL_TIMESTAMP:
case JAVA_UTIL_DATE:
return protoValue.getNumberValue();
Expand All @@ -747,8 +746,6 @@ public static Object getSerialFromProto(Common.TypedValue protoValue) {
return new BigDecimal(bigInt, (int) protoValue.getNumberValue());
}
return new BigDecimal(protoValue.getStringValueBytes().toStringUtf8());
case NUMBER:
return Long.valueOf(protoValue.getNumberValue());
case NULL:
return null;
case ARRAY:
Expand Down Expand Up @@ -802,7 +799,7 @@ public static Common.Rep toProto(Common.TypedValue.Builder builder, Object o) {
writeToProtoWithType(builder, o, Common.Rep.DOUBLE);
return Common.Rep.DOUBLE;
} else if (o instanceof Float) {
writeToProtoWithType(builder, ((Float) o).longValue(), Common.Rep.FLOAT);
writeToProtoWithType(builder, o, Common.Rep.FLOAT);
return Common.Rep.FLOAT;
} else if (o instanceof BigDecimal) {
writeToProtoWithType(builder, o, Common.Rep.BIG_DECIMAL);
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/apache/calcite/avatica/util/AbstractCursor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1318,8 +1318,9 @@ private Object convertValue() throws SQLException {
return componentAccessor.getInt();
case Types.BIGINT:
return componentAccessor.getLong();
case Types.FLOAT:
case Types.REAL:
return componentAccessor.getFloat();
case Types.FLOAT:
case Types.DOUBLE:
return componentAccessor.getDouble();
case Types.ARRAY:
Expand Down
7 changes: 3 additions & 4 deletions server/src/main/java/org/apache/calcite/avatica/jdbc/JdbcResultSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.sql.Struct;
import java.sql.Time;
import java.sql.Timestamp;
Expand Down Expand Up @@ -226,9 +225,9 @@ private static Object getValue(ResultSet resultSet, int type, int j,
try {
// Recursively extracts an Array using its ResultSet-representation
return extractUsingResultSet(array, calendar);
} catch (UnsupportedOperationException | SQLFeatureNotSupportedException e) {
// Not every database might implement Array.getResultSet(). This call
// assumes a non-nested array (depends on the db if that's a valid assumption)
} catch (Exception e) {
// Not every database might implement Array.getResultSet() using the expected structure.
// This call assumes a non-nested array (depends on the db if that's a valid assumption)
return extractUsingArray(array, calendar);
}
case Types.STRUCT:
Expand Down