You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by "tanclary (via GitHub)" <gi...@apache.org> on 2023/07/10 17:51:40 UTC
[GitHub] [calcite] tanclary commented on a diff in pull request #3302: [CALCITE-5821] Add FORMAT_NUMBER function (enabled in Hive and Spark library)
tanclary commented on code in PR #3302:
URL: https://github.com/apache/calcite/pull/3302#discussion_r1258638101
##########
core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java:
##########
@@ -618,6 +618,102 @@ public static ByteString substring(ByteString c, int s, int l) {
return c.substring(s0, e0);
}
+ /** SQL FORMAT_NUMBER(value, decimalOrFormat) function. */
+ public static String formatNumber(byte value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(short value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(int value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(long value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(float value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(double value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(BigDecimal value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(byte value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(short value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(int value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(long value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(float value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(double value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(BigDecimal value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String getFormatPattern(int decimalVal) {
+ StringBuilder pattern = new StringBuilder();
+ pattern.append("#,###,###,###,###,###,##0");
+
Review Comment:
I'm kind of surprised there's not a method somewhere that does this already.
##########
core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java:
##########
@@ -618,6 +618,102 @@ public static ByteString substring(ByteString c, int s, int l) {
return c.substring(s0, e0);
}
+ /** SQL FORMAT_NUMBER(value, decimalOrFormat) function. */
+ public static String formatNumber(byte value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(short value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(int value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(long value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(float value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(double value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(BigDecimal value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(byte value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(short value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(int value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(long value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(float value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(double value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(BigDecimal value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String getFormatPattern(int decimalVal) {
+ StringBuilder pattern = new StringBuilder();
+ pattern.append("#,###,###,###,###,###,##0");
+
+ if (decimalVal > 0) {
+ pattern.append(".");
+ for (int i = 0; i < decimalVal; i++) {
+ pattern.append("0");
+ }
+ }
+ return pattern.toString();
+ }
+
+ public static DecimalFormat getNumberFormat(String pattern) {
Review Comment:
If this is just a helper you can make it private
##########
core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java:
##########
@@ -618,6 +618,102 @@ public static ByteString substring(ByteString c, int s, int l) {
return c.substring(s0, e0);
}
+ /** SQL FORMAT_NUMBER(value, decimalOrFormat) function. */
+ public static String formatNumber(byte value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(short value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(int value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(long value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(float value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(double value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(BigDecimal value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(byte value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(short value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(int value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(long value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(float value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(double value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(BigDecimal value, String format) {
+ DecimalFormat numberFormat = getNumberFormat(format);
+ return numberFormat.format(value);
+ }
+
+ public static String getFormatPattern(int decimalVal) {
+ StringBuilder pattern = new StringBuilder();
+ pattern.append("#,###,###,###,###,###,##0");
+
+ if (decimalVal > 0) {
+ pattern.append(".");
+ for (int i = 0; i < decimalVal; i++) {
+ pattern.append("0");
+ }
+ }
+ return pattern.toString();
+ }
+
+ public static DecimalFormat getNumberFormat(String pattern) {
+ return NumberUtil.decimalFormat(pattern);
+ }
+
+ public static DecimalFormat getNumberFormat(int decimalVal) {
Review Comment:
Same comment as above
##########
core/src/main/java/org/apache/calcite/util/BuiltInMethod.java:
##########
@@ -417,6 +417,7 @@ public enum BuiltInMethod {
INITCAP(SqlFunctions.class, "initcap", String.class),
SUBSTRING(SqlFunctions.class, "substring", String.class, int.class,
int.class),
+ FORMAT_NUMBER(SqlFunctions.class, "formatNumber", int.class, int.class),
Review Comment:
How do the functions with `(int, string)` signature get called when you specify `(int.class, int.class)` here? Not sure if it causes problems, just curious.
##########
core/src/main/java/org/apache/calcite/runtime/SqlFunctions.java:
##########
@@ -618,6 +618,102 @@ public static ByteString substring(ByteString c, int s, int l) {
return c.substring(s0, e0);
}
+ /** SQL FORMAT_NUMBER(value, decimalOrFormat) function. */
+ public static String formatNumber(byte value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(short value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(int value, int decimalVal) {
+ DecimalFormat numberFormat = getNumberFormat(decimalVal);
+ return numberFormat.format(value);
+ }
+
+ public static String formatNumber(long value, int decimalVal) {
Review Comment:
do you need a method for all of these types? There's other functions that use implicit type conversion (see `COSH` or one of the trig functions for a good example). If they're necessary that's fine, just make sure they're all tested.
--
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: commits-unsubscribe@calcite.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org