GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Merge branch 'master' into master · jasync-sql/jasync-sql@c8313ef

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • CHANGELOG.md
  • mysql-async/src
    • main/java/com/github/jasync/sql/db/mysql
      • MySQLConnection.kt
      • codec
        • MySQLConnectionHandler.kt
        • MySQLFrameDecoder.kt
      • decoder
        • AuthenticationSwitchRequestDecoder.kt
      • encoder
        • AuthenticationSwitchResponseEncoder.kt
        • SSLRequestEncoder.kt
      • message
        • client
          • CapabilityRequestMessage.kt
          • HandshakeResponseMessage.kt
        • server
          • AuthenticationSwitchRequest.kt
      • util
        • CapabilityFlag.kt
    • test/java/com/github/jasync/sql/db/mysql
      • UpdateQuerySpec.kt
  • r2dbc-mysql/src/main/java
    • MysqlConnectionFactoryProvider.kt
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎CHANGELOG.md‎

Copy file name to clipboardExpand all lines: CHANGELOG.md
+6Lines changed: 6 additions & 0 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
* Switch to Java Date/Time API from Joda Time [#233](https://github.com/jasync-sql/jasync-sql/pull/233)
66
* For postgresql, add support for threeten.PeriodDuration for interval data type. [#233](https://github.com/jasync-sql/jasync-sql/pull/233)
77

8+
## 1.2.3
9+
10+
* Enable CLIENT_FOUND_ROWS in r2dbc-mysql in favor of spring-data-r2dbc [#240](https://github.com/jasync-sql/jasync-sql/pull/240).
11+
* Fix SSL Connection to MySQL [#237](https://github.com/jasync-sql/jasync-sql/pull/237).
12+
* Add explicit dependency on kotlin-reflect.
13+
814
## 1.2.1
915

1016
* Deploy directly to maven central [#232](https://github.com/jasync-sql/jasync-sql/pull/232).
Collapse file

‎mysql-async/src/main/java/com/github/jasync/sql/db/mysql/MySQLConnection.kt‎

Copy file name to clipboardExpand all lines: mysql-async/src/main/java/com/github/jasync/sql/db/mysql/MySQLConnection.kt
+11-4Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import com.github.jasync.sql.db.mysql.codec.MySQLConnectionHandler
1515
import com.github.jasync.sql.db.mysql.codec.MySQLHandlerDelegate
1616
import com.github.jasync.sql.db.mysql.exceptions.MySQLException
1717
import com.github.jasync.sql.db.mysql.message.client.AuthenticationSwitchResponse
18+
import com.github.jasync.sql.db.mysql.message.client.CapabilityRequestMessage
1819
import com.github.jasync.sql.db.mysql.message.client.HandshakeResponseMessage
19-
import com.github.jasync.sql.db.mysql.message.client.SSLRequestMessage
2020
import com.github.jasync.sql.db.mysql.message.server.AuthenticationSwitchRequest
2121
import com.github.jasync.sql.db.mysql.message.server.EOFMessage
2222
import com.github.jasync.sql.db.mysql.message.server.ErrorMessage
@@ -61,6 +61,7 @@ class MySQLConnection @JvmOverloads constructor(
6161
@Suppress("unused")
6262
val MicrosecondsVersion = Version(5, 6, 0)
6363
private val regexForCallInQueryStart = Regex("\\s*call\\s+.*", RegexOption.IGNORE_CASE)
64+
const val CLIENT_FOUND_ROWS_PROP_NAME = "jasync.mysql.CLIENT_FOUND_ROWS"
6465
}
6566

6667
init {
@@ -262,8 +263,14 @@ class MySQLConnection @JvmOverloads constructor(
262263
}
263264
}
264265

265-
val sslRequest = SSLRequestMessage(setOfNotNull(
266+
val clientFoundRows = System.getProperty(CLIENT_FOUND_ROWS_PROP_NAME) != null
267+
if (clientFoundRows) {
268+
logger.debug { "CLIENT_FOUND_ROWS capability set" }
269+
}
270+
271+
val capabilities = CapabilityRequestMessage(setOfNotNull(
266272
CapabilityFlag.CLIENT_PLUGIN_AUTH,
273+
CapabilityFlag.CLIENT_FOUND_ROWS.takeIf { clientFoundRows },
267274
CapabilityFlag.CLIENT_PROTOCOL_41,
268275
CapabilityFlag.CLIENT_TRANSACTIONS,
269276
CapabilityFlag.CLIENT_MULTI_RESULTS,
@@ -274,7 +281,7 @@ class MySQLConnection @JvmOverloads constructor(
274281
))
275282

276283
val handshakeResponse = HandshakeResponseMessage(
277-
sslRequest,
284+
capabilities,
278285
configuration.username,
279286
configuration.charset,
280287
message.seed,
@@ -289,7 +296,7 @@ class MySQLConnection @JvmOverloads constructor(
289296
return
290297
}
291298

292-
val channelFuture = connectionHandler.write(sslRequest)
299+
val channelFuture = connectionHandler.write(capabilities)
293300
channelFuture.addListener { sslRequestFuture ->
294301
// connectionHandler.write will handle errors (logging, failing promise, etc) in this case.
295302
if (!sslRequestFuture.isSuccess) return@addListener
Collapse file

‎mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLConnectionHandler.kt‎

Copy file name to clipboardExpand all lines: mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLConnectionHandler.kt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import com.github.jasync.sql.db.exceptions.DatabaseException
55
import com.github.jasync.sql.db.general.MutableResultSet
66
import com.github.jasync.sql.db.mysql.binary.BinaryRowDecoder
77
import com.github.jasync.sql.db.mysql.message.client.AuthenticationSwitchResponse
8+
import com.github.jasync.sql.db.mysql.message.client.CapabilityRequestMessage
89
import com.github.jasync.sql.db.mysql.message.client.CloseStatementMessage
910
import com.github.jasync.sql.db.mysql.message.client.HandshakeResponseMessage
1011
import com.github.jasync.sql.db.mysql.message.client.PreparedStatementExecuteMessage
1112
import com.github.jasync.sql.db.mysql.message.client.PreparedStatementPrepareMessage
1213
import com.github.jasync.sql.db.mysql.message.client.QueryMessage
1314
import com.github.jasync.sql.db.mysql.message.client.QuitMessage
14-
import com.github.jasync.sql.db.mysql.message.client.SSLRequestMessage
1515
import com.github.jasync.sql.db.mysql.message.client.SendLongDataMessage
1616
import com.github.jasync.sql.db.mysql.message.server.AuthenticationSwitchRequest
1717
import com.github.jasync.sql.db.mysql.message.server.BinaryRowMessage
@@ -273,7 +273,7 @@ class MySQLConnectionHandler(
273273
}
274274
}
275275

276-
fun write(message: SSLRequestMessage): ChannelFuture = writeAndHandleError(message)
276+
fun write(message: CapabilityRequestMessage): ChannelFuture = writeAndHandleError(message)
277277

278278
fun write(message: HandshakeResponseMessage): ChannelFuture {
279279
decoder.hasDoneHandshake = true
Collapse file

‎mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLFrameDecoder.kt‎

Copy file name to clipboardExpand all lines: mysql-async/src/main/java/com/github/jasync/sql/db/mysql/codec/MySQLFrameDecoder.kt
+9Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.github.jasync.sql.db.mysql.codec
33
import com.github.jasync.sql.db.exceptions.BufferNotFullyConsumedException
44
import com.github.jasync.sql.db.exceptions.NegativeMessageSizeException
55
import com.github.jasync.sql.db.exceptions.ParserNotAvailableException
6+
import com.github.jasync.sql.db.mysql.decoder.AuthenticationSwitchRequestDecoder
67
import com.github.jasync.sql.db.mysql.decoder.ColumnDefinitionDecoder
78
import com.github.jasync.sql.db.mysql.decoder.ColumnProcessingFinishedDecoder
89
import com.github.jasync.sql.db.mysql.decoder.EOFMessageDecoder
@@ -39,6 +40,7 @@ class MySQLFrameDecoder(val charset: Charset, private val connectionId: String)
3940
private val errorDecoder = ErrorDecoder(charset)
4041
private val okDecoder = OkDecoder(charset)
4142
private val columnDecoder = ColumnDefinitionDecoder(charset, DecoderRegistry(charset))
43+
private val authenticationSwitchRequestDecoder = AuthenticationSwitchRequestDecoder(charset)
4244
private val rowDecoder = ResultSetRowDecoder()
4345
private val preparedStatementPrepareDecoder = PreparedStatementPrepareResponseDecoder()
4446

@@ -128,6 +130,8 @@ class MySQLFrameDecoder(val charset: Charset, private val connectionId: String)
128130
if (this.processingColumns) {
129131
this.processingColumns = false
130132
ColumnProcessingFinishedDecoder
133+
} else if (!isValidEOF(slice)) {
134+
authenticationSwitchRequestDecoder
131135
} else {
132136
this.clear()
133137
EOFMessageDecoder
@@ -169,6 +173,11 @@ class MySQLFrameDecoder(val charset: Charset, private val connectionId: String)
169173
doDecoding(decoder, slice, out)
170174
}
171175

176+
private fun isValidEOF(slice: ByteBuf): Boolean {
177+
// see https://dev.mysql.com/doc/internals/en/packet-EOF_Packet.html
178+
return slice.readableBytes() == 4
179+
}
180+
172181
private fun doDecoding(decoder: MessageDecoder?, slice: ByteBuf, out: MutableList<Any>) {
173182
if (decoder == null) {
174183
slice.readerIndex(slice.readerIndex() - 1)
Collapse file

‎mysql-async/src/main/java/com/github/jasync/sql/db/mysql/decoder/AuthenticationSwitchRequestDecoder.kt‎

Copy file name to clipboard
+22Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.github.jasync.sql.db.mysql.decoder
2+
3+
import com.github.jasync.sql.db.mysql.message.server.AuthenticationSwitchRequest
4+
import com.github.jasync.sql.db.mysql.message.server.ServerMessage
5+
import com.github.jasync.sql.db.util.readCString
6+
import io.netty.buffer.ByteBuf
7+
import io.netty.buffer.ByteBufUtil
8+
import java.nio.charset.Charset
9+
10+
class AuthenticationSwitchRequestDecoder(val charset: Charset) : MessageDecoder {
11+
override fun decode(buffer: ByteBuf): ServerMessage {
12+
val method = buffer.readCString(charset)
13+
val bytes: Int = buffer.readableBytes()
14+
val terminal = 0.toByte()
15+
val salt = if (bytes > 0 && buffer.getByte(buffer.writerIndex() - 1) == terminal) ByteBufUtil.getBytes(
16+
buffer,
17+
buffer.readerIndex(),
18+
bytes - 1
19+
) else ByteBufUtil.getBytes(buffer)
20+
return AuthenticationSwitchRequest(method, salt)
21+
}
22+
}
Collapse file

‎mysql-async/src/main/java/com/github/jasync/sql/db/mysql/encoder/AuthenticationSwitchResponseEncoder.kt‎

Copy file name to clipboardExpand all lines: mysql-async/src/main/java/com/github/jasync/sql/db/mysql/encoder/AuthenticationSwitchResponseEncoder.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class AuthenticationSwitchResponseEncoder(val charset: Charset) : MessageEncoder
2121
val buffer = ByteBufferUtils.packetBuffer()
2222

2323
val bytes =
24-
authenticator.generateAuthentication(charset, switch.password, switch.request.seed.toByteArray(charset))
24+
authenticator.generateAuthentication(charset, switch.password, switch.request.seed)
2525
buffer.writeBytes(bytes)
2626

2727
return buffer
Collapse file

‎mysql-async/src/main/java/com/github/jasync/sql/db/mysql/encoder/SSLRequestEncoder.kt‎

Copy file name to clipboardExpand all lines: mysql-async/src/main/java/com/github/jasync/sql/db/mysql/encoder/SSLRequestEncoder.kt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.jasync.sql.db.mysql.encoder
22

3+
import com.github.jasync.sql.db.mysql.message.client.CapabilityRequestMessage
34
import com.github.jasync.sql.db.mysql.message.client.ClientMessage
4-
import com.github.jasync.sql.db.mysql.message.client.SSLRequestMessage
55
import com.github.jasync.sql.db.mysql.util.CharsetMapper
66
import com.github.jasync.sql.db.util.ByteBufferUtils
77
import io.netty.buffer.ByteBuf
@@ -15,7 +15,7 @@ class SSLRequestEncoder(private val charset: Charset, private val charsetMapper:
1515
}
1616

1717
override fun encode(message: ClientMessage): ByteBuf {
18-
require(message is SSLRequestMessage)
18+
require(message is CapabilityRequestMessage)
1919
var clientCapabilities = 0
2020

2121
for (flag in message.flags) {
Collapse file

‎…ysql/message/client/SSLRequestMessage.kt‎ ‎…ssage/client/CapabilityRequestMessage.kt‎mysql-async/src/main/java/com/github/jasync/sql/db/mysql/message/client/SSLRequestMessage.kt renamed to mysql-async/src/main/java/com/github/jasync/sql/db/mysql/message/client/CapabilityRequestMessage.kt mysql-async/src/main/java/com/github/jasync/sql/db/mysql/message/client/SSLRequestMessage.kt renamed to mysql-async/src/main/java/com/github/jasync/sql/db/mysql/message/client/CapabilityRequestMessage.kt

Copy file name to clipboardExpand all lines: mysql-async/src/main/java/com/github/jasync/sql/db/mysql/message/client/CapabilityRequestMessage.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ package com.github.jasync.sql.db.mysql.message.client
22

33
import com.github.jasync.sql.db.mysql.util.CapabilityFlag
44

5-
data class SSLRequestMessage(val flags: Set<CapabilityFlag>) : ClientMessage(SslRequest)
5+
data class CapabilityRequestMessage(val flags: Set<CapabilityFlag>) : ClientMessage(SslRequest)
Collapse file

‎mysql-async/src/main/java/com/github/jasync/sql/db/mysql/message/client/HandshakeResponseMessage.kt‎

Copy file name to clipboardExpand all lines: mysql-async/src/main/java/com/github/jasync/sql/db/mysql/message/client/HandshakeResponseMessage.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.github.jasync.sql.db.mysql.message.client
33
import java.nio.charset.Charset
44

55
data class HandshakeResponseMessage(
6-
val header: SSLRequestMessage,
6+
val header: CapabilityRequestMessage,
77
val username: String,
88
val charset: Charset,
99
@Suppress("ArrayInDataClass")
Collapse file

‎mysql-async/src/main/java/com/github/jasync/sql/db/mysql/message/server/AuthenticationSwitchRequest.kt‎

Copy file name to clipboardExpand all lines: mysql-async/src/main/java/com/github/jasync/sql/db/mysql/message/server/AuthenticationSwitchRequest.kt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ package com.github.jasync.sql.db.mysql.message.server
22

33
data class AuthenticationSwitchRequest(
44
val method: String,
5-
val seed: String
5+
val seed: ByteArray
66
) : ServerMessage(ServerMessage.EOF)

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.