Avoid string formatting during gtid event data deserialization and string parsing when adding the gtid to a GtidSet - Fixed incorrect serverId handling

Author: janickr

src/main/java/com/github/shyiko/mysql/binlog/event/deserialization/GtidEventDataDeserializer.java

@@ -29,16 +29,24 @@ public class GtidEventDataDeserializer implements EventDataDeserializer<GtidEven
     @Override
     public GtidEventData deserialize(ByteArrayInputStream inputStream) throws IOException {
         byte flags = (byte) inputStream.readInteger(1);
-        long sourceIdLeastSignificantBits = inputStream.readLong(8);
-        long sourceIdMostSignificantBits = inputStream.readLong(8);
+        long sourceIdMostSignificantBits = readLongBigEndian(inputStream);
+        long sourceIdLeastSignificantBits = readLongBigEndian(inputStream);
         long transactionId = inputStream.readLong(8);
 
         return new GtidEventData(
             new MySqlGtid(
-                new UUID(sourceIdLeastSignificantBits, sourceIdMostSignificantBits),
+                new UUID(sourceIdMostSignificantBits, sourceIdLeastSignificantBits),
                 transactionId
             ),
             flags
         );
     }
+
+    private static long readLongBigEndian(ByteArrayInputStream input) throws IOException {
+        long result = 0;
+        for (int i = 0; i < 8; ++i) {
+            result = ((result << 8) | (input.read() & 0xff));
+        }
+        return result;
+    }
 }

src/test/java/com/github/shyiko/mysql/binlog/BinaryLogClientGTIDIntegrationTest.java

@@ -15,19 +15,17 @@
  */
 package com.github.shyiko.mysql.binlog;
 
-import com.github.shyiko.mysql.binlog.event.QueryEventData;
-import com.github.shyiko.mysql.binlog.event.XidEventData;
+import com.github.shyiko.mysql.binlog.event.*;
 import com.github.shyiko.mysql.binlog.event.deserialization.EventDeserializer;
 import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.concurrent.TimeUnit;
 
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotEquals;
 import static org.testng.AssertJUnit.assertNotNull;
 
@@ -126,4 +124,63 @@ public void execute(Statement statement) throws SQLException {
             client.connect(DEFAULT_TIMEOUT);
         }
     }
+
+
+    @Test
+    public void testGtidServerId() throws Exception {
+        master.execute("CREATE TABLE if not exists foo (i int)");
+
+        final String[] expectedServerId = new String[1];
+        master.query("select @@server_uuid", new Callback<ResultSet>() {
+            @Override
+            public void execute(ResultSet rs) throws SQLException {
+                rs.next();
+                expectedServerId[0] = rs.getString(1);
+            }
+        });
+
+        final String[] actualServerId = new String[1];
+
+        EventDeserializer eventDeserializer = new EventDeserializer();
+        try {
+            client.disconnect();
+            final BinaryLogClient clientWithKeepAlive = new BinaryLogClient(slave.hostname(), slave.port(),
+                slave.username(), slave.password());
+
+            clientWithKeepAlive.setGtidSet("");
+            clientWithKeepAlive.registerEventListener(eventListener);
+
+
+            clientWithKeepAlive.registerEventListener(new BinaryLogClient.EventListener() {
+                @Override
+                public void onEvent(Event event) {
+                    if (event.getHeader().getEventType() == EventType.GTID) {
+                        actualServerId[0] = ((GtidEventData) event.getData()).getMySqlGtid().getServerId().toString();
+                    }
+                }
+            });
+            clientWithKeepAlive.setEventDeserializer(eventDeserializer);
+            try {
+                eventListener.reset();
+                clientWithKeepAlive.connect(DEFAULT_TIMEOUT);
+
+                master.execute(new Callback<Statement>() {
+                    @Override
+                    public void execute(Statement statement) throws SQLException {
+                        statement.execute("INSERT INTO foo set i = 2");
+                    }
+                });
+
+                eventListener.waitFor(XidEventData.class, 1, TimeUnit.SECONDS.toMillis(4));
+                assertEquals(actualServerId[0], expectedServerId[0]);
+
+
+            } finally {
+                clientWithKeepAlive.disconnect();
+            }
+        } finally {
+            client.connect(DEFAULT_TIMEOUT);
+        }
+    }
+
 }

src/test/java/com/github/shyiko/mysql/binlog/event/deserialization/MysqlGtidEventDataDeserializerTest.java

@@ -17,8 +17,8 @@ public void testDeserialize() throws IOException {
         GtidEventData data = deserializer.deserialize(new ByteArrayInputStream(
             new byte[]{
                 0x03, //flags
-                (byte) 0xe6, 0x11, 0x16, 0x2c, 0x50, 0x78, (byte) 0xbc, 0x24, // sourceId leastSignificantBits little endian
-                0x02, 0x00, 0x11, (byte) 0xac, 0x42, 0x02, 0x73, (byte) 0xa0, //sourceId mostSignificantBits little endian
+                0x24, (byte) 0xbc, 0x78, 0x50, 0x2c, 0x16, 0x11, (byte) 0xe6, // sourceId mostSignificantBits big endian
+                (byte) 0xa0, 0x73, 0x02, 0x42, (byte) 0xac, 0x11, 0x00, 0x02, // sourceId leastSignificantBits big endian
                 (byte) 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // sequence little endian
             }
         ));