deniskuzZ commented on code in PR #5976:
URL: https://github.com/apache/hive/pull/5976#discussion_r2210358193
##########
standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/utils/MetaStoreServerUtils.java:
##########
@@ -1636,27 +1638,42 @@ public static String getPartitionName(Path tablePath,
Path partitionPath, Set<St
return result;
}
- public static String getNormalisedPartitionValue(String partitionValue,
String type) {
-
- if (!NumberUtils.isParsable(partitionValue)) {
+ public static String getNormalisedPartitionValue(String partitionValue,
String type,
+ Configuration conf) {
+ if ((!NumberUtils.isParsable(partitionValue) && !Objects.equals(type,
ColumnType.STRING_TYPE_NAME)
+ && Objects.equals(partitionValue, MetastoreConf.getVar(conf,
+ MetastoreConf.ConfVars.DEFAULTPARTITIONNAME))) || type == null) {
return partitionValue;
}
LOG.debug("Converting '" + partitionValue + "' to type: '" + type + "'.");
-
- if (type.equalsIgnoreCase("tinyint")
- || type.equalsIgnoreCase("smallint")
- || type.equalsIgnoreCase("int")){
- return Integer.toString(Integer.parseInt(partitionValue));
- } else if (type.equalsIgnoreCase("bigint")){
- return Long.toString(Long.parseLong(partitionValue));
- } else if (type.equalsIgnoreCase("float")){
- return Float.toString(Float.parseFloat(partitionValue));
- } else if (type.equalsIgnoreCase("double")){
- return Double.toString(Double.parseDouble(partitionValue));
- } else if (type.startsWith("decimal")){
- // Decimal datatypes are stored like decimal(10,10)
- return new
BigDecimal(partitionValue).stripTrailingZeros().toPlainString();
+ try {
+ switch (type.toLowerCase()) {
+ case ColumnType.TINYINT_TYPE_NAME:
+ case ColumnType.SMALLINT_TYPE_NAME:
+ case ColumnType.INT_TYPE_NAME:
+ return Integer.toString(Integer.parseInt(partitionValue));
+ case ColumnType.BIGINT_TYPE_NAME:
+ return Long.toString(Long.parseLong(partitionValue));
+ case ColumnType.FLOAT_TYPE_NAME:
+ return Float.toString(Float.parseFloat(partitionValue));
+ case ColumnType.DOUBLE_TYPE_NAME:
+ return Double.toString(Double.parseDouble(partitionValue));
+ case ColumnType.DECIMAL_TYPE_NAME:
+ return new
BigDecimal(partitionValue).stripTrailingZeros().toPlainString();
+ default:
+ break;
+ }
+ } catch (NumberFormatException e) {
Review Comment:
there is no point in checking if value is a number and then handling the
exception
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org
For additional commands, e-mail: gitbox-h...@hive.apache.org
