Repository: ignite Updated Branches: refs/heads/master a232b88fe -> 469fb49e4
http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaPrimaryKeysRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaPrimaryKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaPrimaryKeysRequest.java index 957225a..def53b8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaPrimaryKeysRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaPrimaryKeysRequest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.odbc.jdbc; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.Nullable; @@ -66,16 +67,18 @@ public class JdbcMetaPrimaryKeysRequest extends JdbcRequest { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); writer.writeString(schemaName); writer.writeString(tblName); } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); schemaName = reader.readString(); tblName = reader.readString(); http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaPrimaryKeysResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaPrimaryKeysResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaPrimaryKeysResult.java index bd0dd90..f6d986e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaPrimaryKeysResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaPrimaryKeysResult.java @@ -24,6 +24,7 @@ import java.util.List; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; @@ -51,8 +52,9 @@ public class JdbcMetaPrimaryKeysResult extends JdbcResult { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); if (F.isEmpty(meta)) writer.writeInt(0); @@ -60,13 +62,14 @@ public class JdbcMetaPrimaryKeysResult extends JdbcResult { writer.writeInt(meta.size()); for(JdbcPrimaryKeyMeta m : meta) - m.writeBinary(writer); + m.writeBinary(writer, ver); } } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); int size = reader.readInt(); @@ -78,7 +81,7 @@ public class JdbcMetaPrimaryKeysResult extends JdbcResult { for (int i = 0; i < size; ++i) { JdbcPrimaryKeyMeta m = new JdbcPrimaryKeyMeta(); - m.readBinary(reader); + m.readBinary(reader, ver); meta.add(m); } http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaSchemasRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaSchemasRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaSchemasRequest.java index 43bbe5d..715c798 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaSchemasRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaSchemasRequest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.odbc.jdbc; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.internal.S; /** @@ -53,15 +54,17 @@ public class JdbcMetaSchemasRequest extends JdbcRequest { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); writer.writeString(schemaName); } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); this.schemaName = reader.readString(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaSchemasResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaSchemasResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaSchemasResult.java index 48b6aae..8d24a41 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaSchemasResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaSchemasResult.java @@ -21,6 +21,7 @@ import java.util.Collection; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.internal.S; /** @@ -46,15 +47,17 @@ public class JdbcMetaSchemasResult extends JdbcResult { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); JdbcUtils.writeStringCollection(writer, schemas); } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); schemas = JdbcUtils.readStringList(reader); } http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaTablesRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaTablesRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaTablesRequest.java index 740b656..3ea6c35 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaTablesRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaTablesRequest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.odbc.jdbc; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.internal.S; /** @@ -65,16 +66,18 @@ public class JdbcMetaTablesRequest extends JdbcRequest { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); writer.writeString(schemaName); writer.writeString(tblName); } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); this.schemaName = reader.readString(); this.tblName = reader.readString(); http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaTablesResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaTablesResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaTablesResult.java index 585667e..d5afb7c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaTablesResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcMetaTablesResult.java @@ -23,6 +23,7 @@ import java.util.List; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; @@ -49,8 +50,9 @@ public class JdbcMetaTablesResult extends JdbcResult { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); if (F.isEmpty(meta)) writer.writeInt(0); @@ -58,13 +60,14 @@ public class JdbcMetaTablesResult extends JdbcResult { writer.writeInt(meta.size()); for(JdbcTableMeta m : meta) - m.writeBinary(writer); + m.writeBinary(writer, ver); } } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); int size = reader.readInt(); @@ -76,7 +79,7 @@ public class JdbcMetaTablesResult extends JdbcResult { for (int i = 0; i < size; ++i) { JdbcTableMeta m = new JdbcTableMeta(); - m.readBinary(reader); + m.readBinary(reader, ver); meta.add(m); } http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcOrderedBatchExecuteRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcOrderedBatchExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcOrderedBatchExecuteRequest.java index 1d4d4ac..743978d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcOrderedBatchExecuteRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcOrderedBatchExecuteRequest.java @@ -21,6 +21,7 @@ import java.util.List; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.NotNull; @@ -61,15 +62,15 @@ public class JdbcOrderedBatchExecuteRequest extends JdbcBatchExecuteRequest } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); writer.writeLong(order); } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); order = reader.readLong(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcOrderedBatchExecuteResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcOrderedBatchExecuteResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcOrderedBatchExecuteResult.java index 84853d4..76f665f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcOrderedBatchExecuteResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcOrderedBatchExecuteResult.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.odbc.jdbc; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.internal.S; /** @@ -54,16 +55,18 @@ public class JdbcOrderedBatchExecuteResult extends JdbcBatchExecuteResult { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); writer.writeLong(order); } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); order = reader.readLong(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcParameterMeta.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcParameterMeta.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcParameterMeta.java index c0cfc9e..52e5a19 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcParameterMeta.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcParameterMeta.java @@ -22,6 +22,7 @@ import java.sql.SQLException; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.internal.S; /** @@ -133,7 +134,8 @@ public class JdbcParameterMeta implements JdbcRawBinarylizable { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { writer.writeInt(isNullable); writer.writeBoolean(signed); writer.writeInt(precision); @@ -145,7 +147,8 @@ public class JdbcParameterMeta implements JdbcRawBinarylizable { } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { isNullable = reader.readInt(); signed = reader.readBoolean(); precision = reader.readInt(); http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcPrimaryKeyMeta.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcPrimaryKeyMeta.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcPrimaryKeyMeta.java index 6b9bf70..dffbdca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcPrimaryKeyMeta.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcPrimaryKeyMeta.java @@ -21,6 +21,7 @@ import java.util.List; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.F; /** @@ -89,7 +90,8 @@ public class JdbcPrimaryKeyMeta implements JdbcRawBinarylizable { /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { writer.writeString(schemaName); writer.writeString(tblName); writer.writeString(name); @@ -98,7 +100,8 @@ public class JdbcPrimaryKeyMeta implements JdbcRawBinarylizable { } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { schemaName = reader.readString(); tblName = reader.readString(); name = reader.readString(); http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQuery.java index f7ffb99..d9960da 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQuery.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.odbc.jdbc; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.processors.odbc.SqlListenerUtils; import org.apache.ignite.internal.util.typedef.internal.S; @@ -63,7 +64,8 @@ public class JdbcQuery implements JdbcRawBinarylizable { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) { + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) { writer.writeString(sql); if (args == null || args.length == 0) @@ -77,7 +79,8 @@ public class JdbcQuery implements JdbcRawBinarylizable { } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) { + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) { sql = reader.readString(); int argsNum = reader.readInt(); http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryCloseRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryCloseRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryCloseRequest.java index 872889c..5c631c3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryCloseRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryCloseRequest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.odbc.jdbc; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.internal.S; /** @@ -52,15 +53,17 @@ public class JdbcQueryCloseRequest extends JdbcRequest { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); writer.writeLong(queryId); } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); queryId = reader.readLong(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteMultipleStatementsResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteMultipleStatementsResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteMultipleStatementsResult.java index 9bbdd59..44a56aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteMultipleStatementsResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteMultipleStatementsResult.java @@ -23,6 +23,7 @@ import java.util.List; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.internal.S; /** @@ -80,14 +81,15 @@ public class JdbcQueryExecuteMultipleStatementsResult extends JdbcResult { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); if (results != null && results.size() > 0) { writer.writeInt(results.size()); for (JdbcResultInfo r : results) - r.writeBinary(writer); + r.writeBinary(writer, ver); if (results.get(0).isQuery()) { writer.writeBoolean(last); @@ -101,8 +103,9 @@ public class JdbcQueryExecuteMultipleStatementsResult extends JdbcResult { /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); int cnt = reader.readInt(); @@ -114,7 +117,7 @@ public class JdbcQueryExecuteMultipleStatementsResult extends JdbcResult { for (int i = 0; i < cnt; ++i) { JdbcResultInfo r = new JdbcResultInfo(); - r.readBinary(reader); + r.readBinary(reader, ver); results.add(r); } http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteRequest.java index c13117a..e4f3398 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteRequest.java @@ -21,12 +21,15 @@ import java.io.IOException; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.processors.odbc.SqlListenerUtils; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.Nullable; +import static org.apache.ignite.internal.processors.odbc.jdbc.JdbcConnectionContext.VER_2_7_0; + /** * JDBC query execute request. */ @@ -58,6 +61,8 @@ public class JdbcQueryExecuteRequest extends JdbcRequest { */ JdbcQueryExecuteRequest() { super(QRY_EXEC); + + autoCommit = true; } /** @@ -132,8 +137,9 @@ public class JdbcQueryExecuteRequest extends JdbcRequest { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); writer.writeString(schemaName); writer.writeInt(pageSize); @@ -147,15 +153,17 @@ public class JdbcQueryExecuteRequest extends JdbcRequest { SqlListenerUtils.writeObject(writer, arg, false); } - writer.writeByte((byte)stmtType.ordinal()); + if (ver.compareTo(VER_2_7_0) >= 0) + writer.writeBoolean(autoCommit); - writer.writeBoolean(autoCommit); + writer.writeByte((byte)stmtType.ordinal()); } /** {@inheritDoc} */ @SuppressWarnings("SimplifiableIfStatement") - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); schemaName = reader.readString(); pageSize = reader.readInt(); @@ -169,6 +177,9 @@ public class JdbcQueryExecuteRequest extends JdbcRequest { for (int i = 0; i < argsNum; ++i) args[i] = SqlListenerUtils.readObject(reader, false); + if (ver.compareTo(VER_2_7_0) >= 0) + autoCommit = reader.readBoolean(); + try { if (reader.available() > 0) stmtType = JdbcStatementType.fromOrdinal(reader.readByte()); @@ -178,16 +189,6 @@ public class JdbcQueryExecuteRequest extends JdbcRequest { catch (IOException e) { throw new BinaryObjectException(e); } - - try { - if (reader.available() > 0) - autoCommit = reader.readBoolean(); - else - autoCommit = true; - } - catch (IOException e) { - throw new BinaryObjectException(e); - } } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteResult.java index fdebdb8..342e8ef 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryExecuteResult.java @@ -21,6 +21,7 @@ import java.util.List; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.internal.S; /** @@ -112,8 +113,9 @@ public class JdbcQueryExecuteResult extends JdbcResult { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); writer.writeLong(queryId); writer.writeBoolean(isQuery); @@ -131,8 +133,9 @@ public class JdbcQueryExecuteResult extends JdbcResult { /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); queryId = reader.readLong(); isQuery = reader.readBoolean(); http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryFetchRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryFetchRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryFetchRequest.java index 776c3bf..59ed9a8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryFetchRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryFetchRequest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.odbc.jdbc; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.internal.S; /** @@ -65,16 +66,18 @@ public class JdbcQueryFetchRequest extends JdbcRequest { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); writer.writeLong(queryId); writer.writeInt(pageSize); } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); queryId = reader.readLong(); pageSize = reader.readInt(); http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryFetchResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryFetchResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryFetchResult.java index ac4a603..e62efcb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryFetchResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryFetchResult.java @@ -21,6 +21,7 @@ import java.util.List; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.internal.S; /** @@ -66,8 +67,9 @@ public class JdbcQueryFetchResult extends JdbcResult { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); writer.writeBoolean(last); @@ -75,8 +77,9 @@ public class JdbcQueryFetchResult extends JdbcResult { } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); last = reader.readBoolean(); http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryMetadataRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryMetadataRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryMetadataRequest.java index bdef321..f30ecfd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryMetadataRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryMetadataRequest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.odbc.jdbc; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.internal.S; /** @@ -53,15 +54,17 @@ public class JdbcQueryMetadataRequest extends JdbcRequest { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); writer.writeLong(qryId); } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); qryId = reader.readLong(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryMetadataResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryMetadataResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryMetadataResult.java index c8c0991..d366e60 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryMetadataResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcQueryMetadataResult.java @@ -23,6 +23,7 @@ import java.util.List; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; @@ -58,8 +59,9 @@ public class JdbcQueryMetadataResult extends JdbcResult { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { - super.writeBinary(writer); + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.writeBinary(writer, ver); if (F.isEmpty(meta)) writer.writeInt(0); @@ -67,13 +69,14 @@ public class JdbcQueryMetadataResult extends JdbcResult { writer.writeInt(meta.size()); for (JdbcColumnMeta m : meta) - m.writeBinary(writer); + m.writeBinary(writer, ver); } } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { - super.readBinary(reader); + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { + super.readBinary(reader, ver); int size = reader.readInt(); @@ -85,7 +88,7 @@ public class JdbcQueryMetadataResult extends JdbcResult { for (int i = 0; i < size; ++i) { JdbcColumnMeta m = new JdbcColumnMeta(); - m.readBinary(reader); + m.readBinary(reader, ver); meta.add(m); } http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRawBinarylizable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRawBinarylizable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRawBinarylizable.java index c3f1874..22c514d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRawBinarylizable.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRawBinarylizable.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.odbc.jdbc; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; /** * Interface that allows to implement custom serialization @@ -30,15 +31,18 @@ public interface JdbcRawBinarylizable { * Writes fields to provided writer. * * @param writer Binary object writer. + * @param ver ver Protocol version. * @throws BinaryObjectException In case of error. */ - public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException; + public void writeBinary(BinaryWriterExImpl writer, ClientListenerProtocolVersion ver) throws BinaryObjectException; /** * Reads fields from provided reader. * * @param reader Binary object reader. + * @param ver Protocol version. * @throws BinaryObjectException In case of error. */ - public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException; + public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequest.java index 3d5b869..0674edf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequest.java @@ -21,6 +21,7 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.processors.odbc.ClientListenerRequestNoId; /** @@ -77,12 +78,14 @@ public class JdbcRequest extends ClientListenerRequestNoId implements JdbcRawBin } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { writer.writeByte(type); } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { // No-op. } @@ -95,10 +98,12 @@ public class JdbcRequest extends ClientListenerRequestNoId implements JdbcRawBin /** * @param reader Binary reader. + * @param ver Protocol version. * @return Request object. * @throws BinaryObjectException On error. */ - public static JdbcRequest readRequest(BinaryReaderExImpl reader) throws BinaryObjectException { + public static JdbcRequest readRequest(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { int reqType = reader.readByte(); JdbcRequest req; @@ -173,7 +178,7 @@ public class JdbcRequest extends ClientListenerRequestNoId implements JdbcRawBin throw new IgniteException("Unknown SQL listener request ID: [request ID=" + reqType + ']'); } - req.readBinary(reader); + req.readBinary(reader, ver); return req; } http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResponse.java index 91f26d8..5d5b4e3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResponse.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.odbc.jdbc; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.processors.odbc.ClientListenerResponse; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; @@ -76,14 +77,15 @@ public class JdbcResponse extends ClientListenerResponse implements JdbcRawBinar } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { writer.writeInt(status()); if (status() == STATUS_SUCCESS) { writer.writeBoolean(res != null); if (res != null) - res.writeBinary(writer); + res.writeBinary(writer, ver); } else writer.writeString(error()); @@ -91,12 +93,13 @@ public class JdbcResponse extends ClientListenerResponse implements JdbcRawBinar } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { status(reader.readInt()); if (status() == STATUS_SUCCESS) { if (reader.readBoolean()) - res = JdbcResult.readResult(reader); + res = JdbcResult.readResult(reader, ver); } else error(reader.readString()); http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResult.java index 199e5da..3a0d7bb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResult.java @@ -21,6 +21,7 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; /** * JDBC response result. @@ -87,21 +88,24 @@ public class JdbcResult implements JdbcRawBinarylizable { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { writer.writeByte(type); } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { // No-op. } /** * @param reader Binary reader. + * @param ver Protocol verssion. * @return Request object. * @throws BinaryObjectException On error. */ - public static JdbcResult readResult(BinaryReaderExImpl reader) throws BinaryObjectException { + public static JdbcResult readResult(BinaryReaderExImpl reader, ClientListenerProtocolVersion ver) throws BinaryObjectException { int resId = reader.readByte(); JdbcResult res; @@ -191,7 +195,7 @@ public class JdbcResult implements JdbcRawBinarylizable { throw new IgniteException("Unknown SQL listener request ID: [request ID=" + resId + ']'); } - res.readBinary(reader); + res.readBinary(reader, ver); return res; } http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResultInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResultInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResultInfo.java index f0706e4..5fab77a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResultInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcResultInfo.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.odbc.jdbc; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.internal.S; /** @@ -75,14 +76,16 @@ public class JdbcResultInfo implements JdbcRawBinarylizable { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) { + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) { writer.writeBoolean(isQuery); writer.writeLong(updCnt); writer.writeLong(qryId); } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) { + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) { isQuery = reader.readBoolean(); updCnt = reader.readLong(); qryId = reader.readLong(); http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcTableMeta.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcTableMeta.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcTableMeta.java index 5e15189..d4324d6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcTableMeta.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcTableMeta.java @@ -21,6 +21,7 @@ import java.util.Objects; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.internal.binary.BinaryReaderExImpl; import org.apache.ignite.internal.binary.BinaryWriterExImpl; +import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; @@ -66,13 +67,15 @@ public class JdbcTableMeta implements JdbcRawBinarylizable { } /** {@inheritDoc} */ - @Override public void writeBinary(BinaryWriterExImpl writer) throws BinaryObjectException { + @Override public void writeBinary(BinaryWriterExImpl writer, + ClientListenerProtocolVersion ver) throws BinaryObjectException { writer.writeString(schemaName); writer.writeString(tblName); } /** {@inheritDoc} */ - @Override public void readBinary(BinaryReaderExImpl reader) throws BinaryObjectException { + @Override public void readBinary(BinaryReaderExImpl reader, + ClientListenerProtocolVersion ver) throws BinaryObjectException { schemaName = reader.readString(); tblName = reader.readString(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java index 2b51741..d82dcc6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java @@ -47,7 +47,7 @@ public class OdbcConnectionContext extends ClientListenerAbstractConnectionConte /** Version 2.3.2: added multiple statements support. */ public static final ClientListenerProtocolVersion VER_2_3_2 = ClientListenerProtocolVersion.create(2, 3, 2); - /** Version 2.5.0: added authentication and transactions. */ + /** Version 2.5.0: added authentication. */ public static final ClientListenerProtocolVersion VER_2_5_0 = ClientListenerProtocolVersion.create(2, 5, 0); /** Version 2.7.0: added precision and scale. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java index 552841d..3ed6f21 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcMessageParser.java @@ -103,7 +103,7 @@ public class OdbcMessageParser implements ClientListenerMessageParser { boolean autoCommit = true; - if (ver.compareTo(OdbcConnectionContext.VER_2_5_0) >= 0) + if (ver.compareTo(OdbcConnectionContext.VER_2_7_0) >= 0) autoCommit = reader.readBoolean(); res = new OdbcQueryExecuteRequest(schema, sql, params, timeout, autoCommit); @@ -130,7 +130,7 @@ public class OdbcMessageParser implements ClientListenerMessageParser { boolean autoCommit = true; - if (ver.compareTo(OdbcConnectionContext.VER_2_5_0) >= 0) + if (ver.compareTo(OdbcConnectionContext.VER_2_7_0) >= 0) autoCommit = reader.readBoolean(); res = new OdbcQueryExecuteBatchRequest(schema, sql, last, params, timeout, autoCommit); http://git-wip-us.apache.org/repos/asf/ignite/blob/469fb49e/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java index 8672194..0bec66e 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java @@ -476,67 +476,67 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable { writer.incrementState(); case 2: - if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) + if (!writer.writeInt("pageSize", pageSize)) return false; writer.incrementState(); case 3: - if (!writer.writeInt("pageSize", pageSize)) + if (!writer.writeByteArray("paramsBytes", paramsBytes)) return false; writer.incrementState(); case 4: - if (!writer.writeByteArray("paramsBytes", paramsBytes)) + if (!writer.writeMap("parts", parts, MessageCollectionItemType.UUID, MessageCollectionItemType.INT_ARR)) return false; writer.incrementState(); case 5: - if (!writer.writeMap("parts", parts, MessageCollectionItemType.UUID, MessageCollectionItemType.INT_ARR)) + if (!writer.writeCollection("qrys", qrys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 6: - if (!writer.writeIntArray("qryParts", qryParts)) + if (!writer.writeLong("reqId", reqId)) return false; writer.incrementState(); case 7: - if (!writer.writeCollection("qrys", qrys, MessageCollectionItemType.MSG)) + if (!writer.writeCollection("tbls", tbls, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 8: - if (!writer.writeLong("reqId", reqId)) + if (!writer.writeInt("timeout", timeout)) return false; writer.incrementState(); case 9: - if (!writer.writeString("schemaName", schemaName)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); case 10: - if (!writer.writeCollection("tbls", tbls, MessageCollectionItemType.MSG)) + if (!writer.writeIntArray("qryParts", qryParts)) return false; writer.incrementState(); case 11: - if (!writer.writeInt("timeout", timeout)) + if (!writer.writeString("schemaName", schemaName)) return false; writer.incrementState(); case 12: - if (!writer.writeMessage("topVer", topVer)) + if (!writer.writeMessage("mvccSnapshot", mvccSnapshot)) return false; writer.incrementState(); @@ -577,7 +577,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable { reader.incrementState(); case 2: - mvccSnapshot = reader.readMessage("mvccSnapshot"); + pageSize = reader.readInt("pageSize"); if (!reader.isLastRead()) return false; @@ -585,7 +585,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable { reader.incrementState(); case 3: - pageSize = reader.readInt("pageSize"); + paramsBytes = reader.readByteArray("paramsBytes"); if (!reader.isLastRead()) return false; @@ -593,7 +593,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable { reader.incrementState(); case 4: - paramsBytes = reader.readByteArray("paramsBytes"); + parts = reader.readMap("parts", MessageCollectionItemType.UUID, MessageCollectionItemType.INT_ARR, false); if (!reader.isLastRead()) return false; @@ -601,7 +601,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable { reader.incrementState(); case 5: - parts = reader.readMap("parts", MessageCollectionItemType.UUID, MessageCollectionItemType.INT_ARR, false); + qrys = reader.readCollection("qrys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -609,7 +609,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable { reader.incrementState(); case 6: - qryParts = reader.readIntArray("qryParts"); + reqId = reader.readLong("reqId"); if (!reader.isLastRead()) return false; @@ -617,7 +617,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable { reader.incrementState(); case 7: - qrys = reader.readCollection("qrys", MessageCollectionItemType.MSG); + tbls = reader.readCollection("tbls", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -625,7 +625,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable { reader.incrementState(); case 8: - reqId = reader.readLong("reqId"); + timeout = reader.readInt("timeout"); if (!reader.isLastRead()) return false; @@ -633,7 +633,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable { reader.incrementState(); case 9: - schemaName = reader.readString("schemaName"); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; @@ -641,7 +641,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable { reader.incrementState(); case 10: - tbls = reader.readCollection("tbls", MessageCollectionItemType.MSG); + qryParts = reader.readIntArray("qryParts"); if (!reader.isLastRead()) return false; @@ -649,7 +649,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable { reader.incrementState(); case 11: - timeout = reader.readInt("timeout"); + schemaName = reader.readString("schemaName"); if (!reader.isLastRead()) return false; @@ -657,7 +657,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable { reader.incrementState(); case 12: - topVer = reader.readMessage("topVer"); + mvccSnapshot = reader.readMessage("mvccSnapshot"); if (!reader.isLastRead()) return false;
