http://git-wip-us.apache.org/repos/asf/ignite/blob/9fd82212/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientMessageParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientMessageParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientMessageParser.java index f098383..f252a38 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientMessageParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientMessageParser.java @@ -26,9 +26,9 @@ import org.apache.ignite.internal.binary.streams.BinaryHeapInputStream; import org.apache.ignite.internal.binary.streams.BinaryHeapOutputStream; import org.apache.ignite.internal.binary.streams.BinaryInputStream; import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl; -import org.apache.ignite.internal.processors.odbc.SqlListenerMessageParser; -import org.apache.ignite.internal.processors.odbc.SqlListenerRequest; -import org.apache.ignite.internal.processors.odbc.SqlListenerResponse; +import org.apache.ignite.internal.processors.odbc.ClientListenerMessageParser; +import org.apache.ignite.internal.processors.odbc.ClientListenerRequest; +import org.apache.ignite.internal.processors.odbc.ClientListenerResponse; import org.apache.ignite.internal.processors.platform.client.binary.ClientBinaryTypeNameGetRequest; import org.apache.ignite.internal.processors.platform.client.binary.ClientBinaryTypeGetRequest; import org.apache.ignite.internal.processors.platform.client.binary.ClientBinaryTypePutRequest; @@ -39,7 +39,7 @@ import org.apache.ignite.internal.processors.platform.client.cache.ClientCachePu /** * Thin client message parser. */ -public class ClientMessageParser implements SqlListenerMessageParser { +public class ClientMessageParser implements ClientListenerMessageParser { /** */ private static final short OP_CACHE_GET = 1; @@ -74,7 +74,7 @@ public class ClientMessageParser implements SqlListenerMessageParser { } /** {@inheritDoc} */ - @Override public SqlListenerRequest decode(byte[] msg) { + @Override public ClientListenerRequest decode(byte[] msg) { assert msg != null; BinaryInputStream inStream = new BinaryHeapInputStream(msg); @@ -106,7 +106,7 @@ public class ClientMessageParser implements SqlListenerMessageParser { } /** {@inheritDoc} */ - @Override public byte[] encode(SqlListenerResponse resp) { + @Override public byte[] encode(ClientListenerResponse resp) { BinaryHeapOutputStream outStream = new BinaryHeapOutputStream(32); BinaryRawWriter writer = marsh.writer(outStream);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9fd82212/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java index c16d481..56d5b0f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequest.java @@ -19,12 +19,12 @@ package org.apache.ignite.internal.processors.platform.client; import org.apache.ignite.binary.BinaryRawReader; import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.processors.odbc.SqlListenerRequest; +import org.apache.ignite.internal.processors.odbc.ClientListenerRequest; /** * Thin client request. */ -public class ClientRequest implements SqlListenerRequest { +public class ClientRequest implements ClientListenerRequest { /** Request id. */ private final long reqId; http://git-wip-us.apache.org/repos/asf/ignite/blob/9fd82212/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java index 30fb1a8..4dcda23 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientRequestHandler.java @@ -19,14 +19,14 @@ package org.apache.ignite.internal.processors.platform.client; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.binary.BinaryWriterExImpl; -import org.apache.ignite.internal.processors.odbc.SqlListenerRequest; -import org.apache.ignite.internal.processors.odbc.SqlListenerRequestHandler; -import org.apache.ignite.internal.processors.odbc.SqlListenerResponse; +import org.apache.ignite.internal.processors.odbc.ClientListenerRequest; +import org.apache.ignite.internal.processors.odbc.ClientListenerRequestHandler; +import org.apache.ignite.internal.processors.odbc.ClientListenerResponse; /** * Thin client request handler. */ -public class ClientRequestHandler implements SqlListenerRequestHandler { +public class ClientRequestHandler implements ClientListenerRequestHandler { /** Kernal context. */ private final GridKernalContext ctx; @@ -42,12 +42,12 @@ public class ClientRequestHandler implements SqlListenerRequestHandler { } /** {@inheritDoc} */ - @Override public SqlListenerResponse handle(SqlListenerRequest req) { + @Override public ClientListenerResponse handle(ClientListenerRequest req) { return ((ClientRequest)req).process(ctx); } /** {@inheritDoc} */ - @Override public SqlListenerResponse handleException(Exception e) { + @Override public ClientListenerResponse handleException(Exception e) { return null; } http://git-wip-us.apache.org/repos/asf/ignite/blob/9fd82212/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java index 6f2e8d6..1089b48 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientResponse.java @@ -18,12 +18,12 @@ package org.apache.ignite.internal.processors.platform.client; import org.apache.ignite.binary.BinaryRawWriter; -import org.apache.ignite.internal.processors.odbc.SqlListenerResponse; +import org.apache.ignite.internal.processors.odbc.ClientListenerResponse; /** * Thin client response. */ -public class ClientResponse extends SqlListenerResponse { +public class ClientResponse extends ClientListenerResponse { /** Request id. */ private final long reqId; http://git-wip-us.apache.org/repos/asf/ignite/blob/9fd82212/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java index 8c9f5e1..d54aac1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java @@ -532,6 +532,7 @@ public class PlatformConfigurationUtils { * @param in Reader. * @param cfg Configuration. */ + @SuppressWarnings("deprecation") public static void readIgniteConfiguration(BinaryRawReaderEx in, IgniteConfiguration cfg) { if (in.readBoolean()) cfg.setClientMode(in.readBoolean()); @@ -983,6 +984,7 @@ public class PlatformConfigurationUtils { * @param w Writer. * @param cfg Configuration. */ + @SuppressWarnings("deprecation") public static void writeIgniteConfiguration(BinaryRawWriter w, IgniteConfiguration cfg) { assert w != null; assert cfg != null; @@ -1442,6 +1444,7 @@ public class PlatformConfigurationUtils { * @param in Reader. * @return Config. */ + @SuppressWarnings("deprecation") private static SqlConnectorConfiguration readSqlConnectorConfiguration(BinaryRawReader in) { return new SqlConnectorConfiguration() .setHost(in.readString()) @@ -1459,6 +1462,7 @@ public class PlatformConfigurationUtils { * * @param w Writer. */ + @SuppressWarnings("deprecation") private static void writeSqlConnectorConfiguration(BinaryRawWriter w, SqlConnectorConfiguration cfg) { assert w != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/9fd82212/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java index 181ddce..7ec9587 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java @@ -25,8 +25,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.ClientConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.SqlConnectorConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; @@ -72,7 +72,7 @@ public class IgniteCache150ClientsTest extends GridCommonAbstractTest { cfg.setClientFailureDetectionTimeout(200000); cfg.setClientMode(!igniteInstanceName.equals(getTestIgniteInstanceName(0))); - cfg.setSqlConnectorConfiguration(new SqlConnectorConfiguration().setPortRange(1000)); + cfg.setClientConnectorConfiguration(new ClientConnectorConfiguration().setPortRange(1000)); CacheConfiguration[] ccfgs = new CacheConfiguration[CACHES]; http://git-wip-us.apache.org/repos/asf/ignite/blob/9fd82212/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcConfigurationValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcConfigurationValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcConfigurationValidationSelfTest.java index ae3f592..cabeb49 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcConfigurationValidationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/odbc/OdbcConfigurationValidationSelfTest.java @@ -161,7 +161,6 @@ public class OdbcConfigurationValidationSelfTest extends GridCommonAbstractTest NODE_IDX_GEN.incrementAndGet()); cfg.setLocalHost("127.0.0.1"); - cfg.setSqlConnectorConfiguration(null); cfg.setOdbcConfiguration(odbcCfg); cfg.setMarshaller(new BinaryMarshaller()); http://git-wip-us.apache.org/repos/asf/ignite/blob/9fd82212/modules/indexing/src/test/java/org/apache/ignite/internal/processors/client/ClientConnectorConfigurationValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/client/ClientConnectorConfigurationValidationSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/client/ClientConnectorConfigurationValidationSelfTest.java new file mode 100644 index 0000000..2044949 --- /dev/null +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/client/ClientConnectorConfigurationValidationSelfTest.java @@ -0,0 +1,241 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.client; + +import junit.framework.TestCase; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cache.query.annotations.QuerySqlField; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.configuration.ClientConnectorConfiguration; +import org.apache.ignite.internal.binary.BinaryMarshaller; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.jetbrains.annotations.Nullable; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.Statement; +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * Client connector configuration validation tests. + */ +@SuppressWarnings("deprecation") +public class ClientConnectorConfigurationValidationSelfTest extends GridCommonAbstractTest { + /** Node index generator. */ + private static final AtomicInteger NODE_IDX_GEN = new AtomicInteger(); + + /** Cache name. */ + private static final String CACHE_NAME = "CACHE"; + + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + stopAllGrids(); + } + + /** + * Test host. + * + * @throws Exception If failed. + */ + public void testDefault() throws Exception { + check(new ClientConnectorConfiguration(), true); + assertJdbc(null, ClientConnectorConfiguration.DFLT_PORT); + } + + /** + * Test host. + * + * @throws Exception If failed. + */ + public void testHost() throws Exception { + check(new ClientConnectorConfiguration().setHost("126.0.0.1"), false); + + check(new ClientConnectorConfiguration().setHost("127.0.0.1"), true); + assertJdbc("127.0.0.1", ClientConnectorConfiguration.DFLT_PORT); + + check(new ClientConnectorConfiguration().setHost("0.0.0.0"), true); + assertJdbc("0.0.0.0", ClientConnectorConfiguration.DFLT_PORT + 1); + + } + + /** + * Test port. + * + * @throws Exception If failed. + */ + public void testPort() throws Exception { + check(new ClientConnectorConfiguration().setPort(-1), false); + check(new ClientConnectorConfiguration().setPort(0), false); + check(new ClientConnectorConfiguration().setPort(512), false); + check(new ClientConnectorConfiguration().setPort(65536), false); + + check(new ClientConnectorConfiguration().setPort(ClientConnectorConfiguration.DFLT_PORT), true); + assertJdbc(null, ClientConnectorConfiguration.DFLT_PORT); + + check(new ClientConnectorConfiguration().setPort(ClientConnectorConfiguration.DFLT_PORT + 200), true); + assertJdbc(null, ClientConnectorConfiguration.DFLT_PORT + 200); + } + + + /** + * Test port. + * + * @throws Exception If failed. + */ + public void testPortRange() throws Exception { + check(new ClientConnectorConfiguration().setPortRange(-1), false); + + check(new ClientConnectorConfiguration().setPortRange(0), true); + assertJdbc(null, ClientConnectorConfiguration.DFLT_PORT); + + check(new ClientConnectorConfiguration().setPortRange(10), true); + assertJdbc(null, ClientConnectorConfiguration.DFLT_PORT + 1); + } + + /** + * Test socket buffers. + * + * @throws Exception If failed. + */ + public void testSocketBuffers() throws Exception { + check(new ClientConnectorConfiguration().setSocketSendBufferSize(-4 * 1024), false); + check(new ClientConnectorConfiguration().setSocketReceiveBufferSize(-4 * 1024), false); + + check(new ClientConnectorConfiguration().setSocketSendBufferSize(4 * 1024), true); + assertJdbc(null, ClientConnectorConfiguration.DFLT_PORT); + + check(new ClientConnectorConfiguration().setSocketReceiveBufferSize(4 * 1024), true); + assertJdbc(null, ClientConnectorConfiguration.DFLT_PORT + 1); + } + + /** + * Test max open cursors per connection. + * + * @throws Exception If failed. + */ + public void testMaxOpenCusrorsPerConnection() throws Exception { + check(new ClientConnectorConfiguration().setMaxOpenCursorsPerConnection(-1), false); + + check(new ClientConnectorConfiguration().setMaxOpenCursorsPerConnection(0), true); + assertJdbc(null, ClientConnectorConfiguration.DFLT_PORT); + + check(new ClientConnectorConfiguration().setMaxOpenCursorsPerConnection(100), true); + assertJdbc(null, ClientConnectorConfiguration.DFLT_PORT + 1); + } + + /** + * Test thread pool size. + * + * @throws Exception If failed. + */ + public void testThreadPoolSize() throws Exception { + check(new ClientConnectorConfiguration().setThreadPoolSize(0), false); + check(new ClientConnectorConfiguration().setThreadPoolSize(-1), false); + + check(new ClientConnectorConfiguration().setThreadPoolSize(4), true); + assertJdbc(null, ClientConnectorConfiguration.DFLT_PORT); + } + + /** + * Perform check. + * + * @param sqlCfg SQL configuration. + * @param success Success flag. * @throws Exception If failed. + */ + @SuppressWarnings({"ThrowableResultOfMethodCallIgnored", "unchecked"}) + private void check(ClientConnectorConfiguration sqlCfg, boolean success) throws Exception { + final IgniteConfiguration cfg = super.getConfiguration(); + + cfg.setIgniteInstanceName(ClientConnectorConfigurationValidationSelfTest.class.getName() + "-" + + NODE_IDX_GEN.incrementAndGet()); + + cfg.setLocalHost("127.0.0.1"); + cfg.setClientConnectorConfiguration(sqlCfg); + cfg.setMarshaller(new BinaryMarshaller()); + + TcpDiscoverySpi spi = new TcpDiscoverySpi(); + spi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + + cfg.setDiscoverySpi(spi); + + CacheConfiguration ccfg = new CacheConfiguration(CACHE_NAME) + .setIndexedTypes(SqlConnectorKey.class, SqlConnectorValue.class); + + cfg.setCacheConfiguration(ccfg); + + if (success) + startGrid(cfg.getIgniteInstanceName(), cfg); + else { + GridTestUtils.assertThrows(log, new Callable<Void>() { + @Override public Void call() throws Exception { + startGrid(cfg.getIgniteInstanceName(), cfg); + + return null; + } + }, IgniteException.class, null); + } + } + + /** + * Make sure that JDBC connection is possible at the given host and port. + * + * @param host Host. + * @param port Port. + * @throws Exception If failed. + */ + private void assertJdbc(@Nullable String host, int port) throws Exception { + if (host == null) + host = "127.0.0.1"; + + String connStr = "jdbc:ignite:thin://" + host + ":" + port; + + try (Connection conn = DriverManager.getConnection(connStr)) { + conn.setSchema(CACHE_NAME); + + try (Statement stmt = conn.createStatement()) { + ResultSet rs = stmt.executeQuery("SELECT 1"); + + assertTrue(rs.next()); + + TestCase.assertEquals(1, rs.getInt(1)); + } + } + } + + /** + * Key class. + */ + private static class SqlConnectorKey { + @QuerySqlField + public int key; + } + + /** + * Value class. + */ + private static class SqlConnectorValue { + @QuerySqlField + public int val; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/9fd82212/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/SqlConnectorConfigurationValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/SqlConnectorConfigurationValidationSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/SqlConnectorConfigurationValidationSelfTest.java index da46b70..4d1b333 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/SqlConnectorConfigurationValidationSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/SqlConnectorConfigurationValidationSelfTest.java @@ -38,8 +38,9 @@ import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicInteger; /** - * ODBC configuration validation tests. + * SQL connector configuration validation tests. */ +@SuppressWarnings("deprecation") public class SqlConnectorConfigurationValidationSelfTest extends GridCommonAbstractTest { /** Node index generator. */ private static final AtomicInteger NODE_IDX_GEN = new AtomicInteger(); http://git-wip-us.apache.org/repos/asf/ignite/blob/9fd82212/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java index e5e37cc..076468b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java @@ -122,6 +122,7 @@ import org.apache.ignite.internal.processors.cache.query.GridCacheQueryTransform import org.apache.ignite.internal.processors.cache.query.IgniteCacheQueryCacheDestroySelfTest; import org.apache.ignite.internal.processors.cache.query.IndexingSpiQuerySelfTest; import org.apache.ignite.internal.processors.cache.query.IndexingSpiQueryTxSelfTest; +import org.apache.ignite.internal.processors.client.ClientConnectorConfigurationValidationSelfTest; import org.apache.ignite.internal.processors.query.h2.IgniteSqlBigIntegerKeyTest; import org.apache.ignite.internal.processors.query.IgniteQueryDedicatedPoolTest; import org.apache.ignite.internal.processors.query.IgniteSqlEntryCacheModeAgnosticTest; @@ -157,6 +158,7 @@ public class IgniteCacheQuerySelfTestSuite extends TestSuite { IgniteTestSuite suite = new IgniteTestSuite("Ignite Cache Queries Test Suite"); suite.addTestSuite(SqlConnectorConfigurationValidationSelfTest.class); + suite.addTestSuite(ClientConnectorConfigurationValidationSelfTest.class); suite.addTestSuite(SqlSchemaSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/9fd82212/modules/platforms/cpp/odbc-test/config/queries-test-default.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/config/queries-test-default.xml b/modules/platforms/cpp/odbc-test/config/queries-test-default.xml index 2e7f374..22524d2 100644 --- a/modules/platforms/cpp/odbc-test/config/queries-test-default.xml +++ b/modules/platforms/cpp/odbc-test/config/queries-test-default.xml @@ -28,8 +28,8 @@ <import resource="queries-default.xml"/> <bean abstract="true" id="queries.cfg" parent="ignite.cfg"> - <property name="sqlConnectorConfiguration"> - <bean class="org.apache.ignite.configuration.SqlConnectorConfiguration"> + <property name="clientConnectorConfiguration"> + <bean class="org.apache.ignite.configuration.ClientConnectorConfiguration"> <property name="host" value="127.0.0.1"/> <property name="port" value="11110"/> <property name="portRange" value="0"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/9fd82212/modules/platforms/cpp/odbc-test/config/queries-test-noodbc-32.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/config/queries-test-noodbc-32.xml b/modules/platforms/cpp/odbc-test/config/queries-test-noodbc-32.xml index 568f685..b98d668 100644 --- a/modules/platforms/cpp/odbc-test/config/queries-test-noodbc-32.xml +++ b/modules/platforms/cpp/odbc-test/config/queries-test-noodbc-32.xml @@ -28,7 +28,7 @@ <import resource="queries-default.xml"/> <bean parent="ignite.cfg"> - <property name="sqlConnectorConfiguration"> + <property name="clientConnectorConfiguration"> <null/> </property> http://git-wip-us.apache.org/repos/asf/ignite/blob/9fd82212/modules/platforms/cpp/odbc-test/config/queries-test-noodbc.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/config/queries-test-noodbc.xml b/modules/platforms/cpp/odbc-test/config/queries-test-noodbc.xml index 5cc6044..29fee23 100644 --- a/modules/platforms/cpp/odbc-test/config/queries-test-noodbc.xml +++ b/modules/platforms/cpp/odbc-test/config/queries-test-noodbc.xml @@ -28,7 +28,7 @@ <import resource="queries-default.xml"/> <bean parent="ignite.cfg"> - <property name="sqlConnectorConfiguration"> + <property name="clientConnectorConfiguration"> <null/> </property> </bean>
