abhishekagarwal87 commented on a change in pull request #10635:
URL: https://github.com/apache/druid/pull/10635#discussion_r535985635
##########
File path:
core/src/test/java/org/apache/druid/java/util/common/HumanReadableBytesTest.java
##########
@@ -395,6 +395,107 @@ public void testBytesRange()
Assert.assertEquals("value must be in the range of [0, 5]", message);
}
+ @Test
+ public void testFormatInBinaryByte()
+ {
+ Assert.assertEquals("-8.00 EiB", HumanReadableBytes.format(Long.MIN_VALUE,
2, HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("-8.000 EiB",
HumanReadableBytes.format(Long.MIN_VALUE, 3,
HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+
+ Assert.assertEquals("-2.00 GiB",
HumanReadableBytes.format(Integer.MIN_VALUE, 2,
HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("-32.00 KiB",
HumanReadableBytes.format(Short.MIN_VALUE, 2,
HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("-128.00 B", HumanReadableBytes.format(Byte.MIN_VALUE,
2, HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("-1.00 B", HumanReadableBytes.format(-1, 2,
HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("0.00 B", HumanReadableBytes.format(0, 2,
HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("1.00 B", HumanReadableBytes.format(1, 2,
HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("1.00 KiB", HumanReadableBytes.format(1024L, 2,
HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("1.00 MiB", HumanReadableBytes.format(1024L * 1024, 2,
HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("1.00 GiB", HumanReadableBytes.format(1024L * 1024 *
1024, 2, HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("1.00 TiB", HumanReadableBytes.format(1024L * 1024 *
1024 * 1024, 2, HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("1.00 PiB", HumanReadableBytes.format(1024L * 1024 *
1024 * 1024 * 1024, 2, HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("8.00 EiB", HumanReadableBytes.format(Long.MAX_VALUE,
2, HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ }
+
+ @Test
+ public void testPrecisionInBinaryFormat()
+ {
+ Assert.assertEquals("1 KiB", HumanReadableBytes.format(1500, 0,
HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("1.5 KiB", HumanReadableBytes.format(1500, 1,
HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("1.46 KiB", HumanReadableBytes.format(1500, 2,
HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ Assert.assertEquals("1.465 KiB", HumanReadableBytes.format(1500, 3,
HumanReadableBytes.UnitSystem.BINARY_BYTE, true));
+ }
+
+ @Test
+ public void testPrecisionInDecimalFormat()
+ {
+ Assert.assertEquals("1 KB", HumanReadableBytes.format(1456, 0,
HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+ Assert.assertEquals("1.5 KB", HumanReadableBytes.format(1456, 1,
HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+ Assert.assertEquals("1.46 KB", HumanReadableBytes.format(1456, 2,
HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+ Assert.assertEquals("1.456 KB", HumanReadableBytes.format(1456, 3,
HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+ }
+
+ @Test
+ public void testFormatInDecimalByte()
+ {
+ Assert.assertEquals("1.00 B", HumanReadableBytes.format(1, 2,
HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+ Assert.assertEquals("1.00 KB", HumanReadableBytes.format(1000L, 2,
HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+ Assert.assertEquals("1.00 MB", HumanReadableBytes.format(1000L * 1000, 2,
HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+ Assert.assertEquals("1.00 GB", HumanReadableBytes.format(1000L * 1000 *
1000, 2, HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+ Assert.assertEquals("1.00 TB", HumanReadableBytes.format(1000L * 1000 *
1000 * 1000, 2, HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+ Assert.assertEquals("1.00 PB", HumanReadableBytes.format(1000L * 1000 *
1000 * 1000 * 1000, 2, HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+ Assert.assertEquals("9.22 EB", HumanReadableBytes.format(Long.MAX_VALUE,
2, HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+
+ Assert.assertEquals("100.00 KB", HumanReadableBytes.format(99999, 2,
HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+ Assert.assertEquals("99.999 KB", HumanReadableBytes.format(99999, 3,
HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+
+ Assert.assertEquals("999.9 PB",
HumanReadableBytes.format(999_949_999_999_999_999L, 1,
HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+ Assert.assertEquals("999.95 PB",
HumanReadableBytes.format(999_949_999_999_999_999L, 2,
HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+ Assert.assertEquals("999.949 PB",
HumanReadableBytes.format(999_949_999_999_999_999L, 3,
HumanReadableBytes.UnitSystem.DECIMAL_BYTE, true));
+ }
+
+ @Test
+ public void testFormatInDecimal()
+ {
+ Assert.assertEquals("1.00 ", HumanReadableBytes.format(1, 2,
HumanReadableBytes.UnitSystem.DECIMAL, true));
Review comment:
in this particular scenario, should space be appended?
##########
File path:
core/src/main/java/org/apache/druid/java/util/common/HumanReadableBytes.java
##########
@@ -208,4 +208,108 @@ private static long parseInner(String rawNumber)
throw new IAE("Invalid format or out of range of long: %s", rawNumber);
}
}
+
+ public enum UnitSystem
+ {
+ /**
+ * also known as IEC format
+ * eg: B, KiB, MiB, GiB ...
+ */
+ BINARY_BYTE,
+
+ /**
+ * also known as SI format
+ * eg: B, KB, MB ...
+ */
+ DECIMAL_BYTE,
+
+ /**
+ * simplified SI format without 'B' indicator
+ * eg: K, M, G ...
+ */
+ DECIMAL
+ }
+
+ /**
+ * Returns a human-readable string version of input value
+ *
+ * @param bytes input value. Negative value is also allowed
+ * @param precision [0,3]
+ * @param unitSystem which unit system is adopted to format the input value,
see {@link UnitSystem}
+ * @param hasSpace if it's true, there's an extra space between the number
and the unit suffix
+ */
+ public static String format(long bytes, int precision, UnitSystem
unitSystem, boolean hasSpace)
Review comment:
is the `hasSpace` customizable from outside? May be it can be just
hard-coded to true.
##########
File path: sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
##########
@@ -16153,6 +16161,44 @@ public void testTimeStampAddConversion() throws
Exception
);
}
+ public void testSizeFormatFunction() throws Exception
+ {
+ testQuery(
+ "SELECT m1, "
+ + "BINARY_BYTE_FORMAT(45678),"
+ + "BINARY_BYTE_FORMAT(m1*12345),"
+ + "BINARY_BYTE_FORMAT(m1*12345, 0), "
+ + "DECIMAL_BYTE_FORMAT(m1*12345), "
+ + "DECIMAL_FORMAT(m1*12345) "
+ + "FROM numfoo WHERE f1 = 0.1 LIMIT 1",
+ ImmutableList.of(
+ newScanQueryBuilder()
+ .dataSource(CalciteTests.DATASOURCE3)
+ .intervals(querySegmentSpec(Filtration.eternity()))
+ .virtualColumns(expressionVirtualColumn("v0", "'44.61KiB'",
ValueType.STRING),
Review comment:
should this be?
```suggestion
.virtualColumns(expressionVirtualColumn("v0",
"binary_date_format(45678)", ValueType.STRING),
```
##########
File path:
sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/SizeFormatOperatorConversion.java
##########
@@ -0,0 +1,117 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.sql.calcite.expression.builtin;
+
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.sql.SqlCallBinding;
+import org.apache.calcite.sql.SqlFunction;
+import org.apache.calcite.sql.SqlFunctionCategory;
+import org.apache.calcite.sql.SqlOperandCountRange;
+import org.apache.calcite.sql.SqlOperator;
+import org.apache.calcite.sql.type.SqlOperandCountRanges;
+import org.apache.calcite.sql.type.SqlOperandTypeChecker;
+import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.segment.column.RowSignature;
+import org.apache.druid.sql.calcite.expression.DruidExpression;
+import org.apache.druid.sql.calcite.expression.OperatorConversions;
+import org.apache.druid.sql.calcite.expression.SqlOperatorConversion;
+import org.apache.druid.sql.calcite.planner.PlannerContext;
+
+public class SizeFormatOperatorConversion implements SqlOperatorConversion
+{
+ public static final SqlOperatorConversion BINARY_BYTE_FORMAT = new
SizeFormatOperatorConversion("binary_byte_format");
+ public static final SqlOperatorConversion DECIMAL_BYTE_FORMAT = new
SizeFormatOperatorConversion("decimal_byte_format");
+ public static final SqlOperatorConversion DECIMAL_FORMAT = new
SizeFormatOperatorConversion("decimal_format");
+
+ private final String name;
+ private final SqlFunction sqlFunction;
+
+ private SizeFormatOperatorConversion(String name)
+ {
+ this.sqlFunction = OperatorConversions
+ .operatorBuilder(StringUtils.toUpperCase(name))
+ .operandTypeChecker(new StringFormatOperandTypeChecker())
+ .functionCategory(SqlFunctionCategory.STRING)
+ .returnTypeNonNull(SqlTypeName.VARCHAR)
+ .build();
+
+ this.name = name;
+ }
+
+ @Override
+ public SqlOperator calciteOperator()
+ {
+ return sqlFunction;
+ }
+
+ @Override
+ public DruidExpression toDruidExpression(
+ final PlannerContext plannerContext,
+ final RowSignature rowSignature,
+ final RexNode rexNode
+ )
+ {
+ return OperatorConversions.convertCall(plannerContext, rowSignature,
rexNode, name);
+ }
+
+ private static class StringFormatOperandTypeChecker implements
SqlOperandTypeChecker
+ {
+ @Override
+ public boolean checkOperandTypes(SqlCallBinding callBinding, boolean
throwOnFailure)
+ {
+ final RelDataType firstArgType = callBinding.getOperandType(0);
Review comment:
shouldn't there be a check on `precision` as well?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
