keith-turner commented on a change in pull request #2535: URL: https://github.com/apache/accumulo/pull/2535#discussion_r819192896
########## File path: core/src/main/java/org/apache/accumulo/core/client/lexicoder/BigDecimalLexicoder.java ########## @@ -0,0 +1,88 @@ +/* + * 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.accumulo.core.client.lexicoder; + +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.math.BigDecimal; +import java.math.BigInteger; + +import org.apache.accumulo.core.clientImpl.lexicoder.FixedByteArrayOutputStream; + +/** + * A lexicoder to encode/decode a BigDecimal to/from bytes that maintain its native Java sort order. + * + * @since 2.1.0 + */ +public class BigDecimalLexicoder extends AbstractLexicoder<BigDecimal> { + + private final BigIntegerLexicoder bigIntegerLexicoder = new BigIntegerLexicoder(); + + @Override + public BigDecimal decode(byte[] b) { + // This concrete implementation is provided for binary compatibility, since the corresponding + // superclass method has type-erased return type Object. See ACCUMULO-3789 and #1285. + return super.decode(b); + } + + @Override + public byte[] encode(BigDecimal bd) { + // To encode we separate out the scale and the unscaled value + // serialize each value individually and store them + int scale = bd.scale(); + BigInteger bigInt = bd.unscaledValue(); + byte[] encodedbigInt = bigIntegerLexicoder.encode(bigInt); + // Length is set to size of encoded BigInteger + length of the scale value + byte[] ret = new byte[4 + encodedbigInt.length]; + try (DataOutputStream dos = new DataOutputStream(new FixedByteArrayOutputStream(ret))) { + scale = scale ^ 0x80000000; + dos.write(encodedbigInt); + dos.writeInt(scale); Review comment: Wondering if the scale should be added first so that its sorted on first. Thinking of numbers like `4.2E-100`, `4.2E-10`, `4.2E+10`, `4.2E+100` ```suggestion dos.writeInt(scale); dos.write(encodedbigInt); ``` ########## File path: core/src/test/java/org/apache/accumulo/core/client/lexicoder/BigDecimalLexicoderTest.java ########## @@ -0,0 +1,59 @@ +/* + * 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.accumulo.core.client.lexicoder; + +import java.math.BigDecimal; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.apache.accumulo.core.clientImpl.lexicoder.AbstractLexicoderTest; +import org.junit.jupiter.api.Test; + +public class BigDecimalLexicoderTest extends AbstractLexicoderTest { + + @Test + public void testSortOrder() { + + var list = Stream.of("2.0", "2.00", "2.000", "-3.000", "-2.00", "0.0000", "0.1", "0.10", Review comment: Try adding a number with the same unscaled value that has different exponents. ```suggestion var list = Stream.of("4.2E+10","4.2E+100","4.2E-10","4.2E-100","4.2","2.0", "2.00", "2.000", "-3.000", "-2.00", "0.0000", "0.1", "0.10", ``` -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
