Skip to content

CASSANALYTICS-68: Optimise byte array to hex string conversion #1380

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
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

CASSANALYTICS-68: Optimise byte array to hex string conversion #1380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion driver/src/main/scala/com/datastax/spark/connector/types/TypeConverter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,18 @@ object TypeConverter {
}
}

private def byteArrayToString (x: Array[Byte]) = "0x" + x.map("%02x" format _).mkString
private val HEX_CHARS = Array(
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
)
private def byteArrayToString (x: Array[Byte]) : String = {
val result = new StringBuilder(x.length * 2)
x.foreach { b =>
val v = b & 0xFF
result.append(HEX_CHARS(v >>> 4))
result.append(HEX_CHARS(v & 0x0F))
}
"0x" + result.toString()
}
private def stringToByteArray (x: String) = new BigInteger(x.substring(2), 16).toByteArray

private val ByteBufferTypeTag = implicitly[TypeTag[ByteBuffer]]
Expand Down
7 changes: 7 additions & 0 deletions driver/src/test/scala/com/datastax/spark/connector/types/TypeConverterTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,13 @@ class TypeConverterTest {
assertEquals("a string", c.convert("a string"))
}

@Test
def testByteArrayToString() {
val c = TypeConverter.forType[String]
val byteArray : Array[Byte] = Array(1,3,-56,45,23,67)
assertEquals("0x0103c82d1743", c.convert(byteArray))
}

@Test
def testDate() {
val c = TypeConverter.forType[Date]
Expand Down