Skip to content

Improve performance of BinaryEncode hex format #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rellem wants to merge 2 commits into
base: 4.2
Choose a base branch
from
Open

Improve performance of BinaryEncode hex format #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a66dde7
Add test case that verifies the functionality of BinaryEncode(binary,
rellem Nov 1, 2014
7669a02
Improve the performance of BinaryEncode(binary, "hex") by replacing the
rellem Nov 1, 2014
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
16 changes: 3 additions & 13 deletions railo-java/railo-core/src/railo/runtime/coder/HexCoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package railo.runtime.coder;

import org.apache.commons.codec.binary.Hex;

import railo.commons.io.CharsetUtil;


Expand All @@ -14,19 +16,7 @@ public final class HexCoder {
* @return encoed String
*/
public static String encode(byte[] bytes) {
String retorno = "";
if (bytes==null || bytes.length==0) {
return retorno;
}
for (int i=0; i<bytes.length; i++) {
byte valor = bytes[i];
int d1 = valor & 0xF;
d1 += (d1 < 10) ? 48 : 55;
int d2 = (valor & 0xF0) >> 4;
d2 += (d2 < 10) ? 48 : 55;
retorno = retorno + (char)d2 + (char)d1;
}
return retorno;
return Hex.encodeHexString(bytes).toUpperCase();
}

/**
Expand Down
13 changes: 13 additions & 0 deletions tests/testcases/functions/BinaryEncode.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
component extends="org.railo.cfml.test.RailoTestCase" {

public function setUp() {
variables.emptyBinary = CharsetDecode("", "utf-8");
variables.binaryHello = CharsetDecode("Hello", "utf-8");
}

function testHex() {
$assert.isEqualWithCase("", BinaryEncode(variables.emptyBinary, "hex"));
$assert.isEqualWithCase("48656C6C6F", BinaryEncode(variables.binaryHello, "hex"));
}

}