You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/03/29 09:16:22 UTC
ignite git commit: IGNITE-2897: ODBC is now disabled by default. This
closes #583.
Repository: ignite
Updated Branches:
refs/heads/ignite-1786 6967cc0b7 -> 607609d5e
IGNITE-2897: ODBC is now disabled by default. This closes #583.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/607609d5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/607609d5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/607609d5
Branch: refs/heads/ignite-1786
Commit: 607609d5e003c50ecef99af950bf5b3df5e61c1b
Parents: 6967cc0
Author: isapego <is...@gridgain.com>
Authored: Tue Mar 29 10:16:18 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Mar 29 10:16:18 2016 +0300
----------------------------------------------------------------------
.../configuration/IgniteConfiguration.java | 2 +-
.../cpp/core-test/config/cache-query.xml | 1 -
.../cpp/core-test/config/cache-test.xml | 1 -
.../odbc-example/config/example-odbc.xml | 103 ++++++++++---------
.../cpp/odbc-test/config/queries-test.xml | 5 +
5 files changed, 60 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/607609d5/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index b003a78..e06978f 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -412,7 +412,7 @@ public class IgniteConfiguration {
private ConnectorConfiguration connectorCfg = new ConnectorConfiguration();
/** ODBC configuration. */
- private OdbcConfiguration odbcCfg = new OdbcConfiguration();
+ private OdbcConfiguration odbcCfg;
/** Warmup closure. Will be invoked before actual grid start. */
private IgniteInClosure<IgniteConfiguration> warmupClos;
http://git-wip-us.apache.org/repos/asf/ignite/blob/607609d5/modules/platforms/cpp/core-test/config/cache-query.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-query.xml b/modules/platforms/cpp/core-test/config/cache-query.xml
index 1602df0..232b6da 100644
--- a/modules/platforms/cpp/core-test/config/cache-query.xml
+++ b/modules/platforms/cpp/core-test/config/cache-query.xml
@@ -31,7 +31,6 @@
<bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
<property name="localHost" value="127.0.0.1"/>
<property name="connectorConfiguration"><null/></property>
- <property name="odbcConfiguration"><null/></property>
<property name="cacheConfiguration">
<list>
http://git-wip-us.apache.org/repos/asf/ignite/blob/607609d5/modules/platforms/cpp/core-test/config/cache-test.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-test.xml b/modules/platforms/cpp/core-test/config/cache-test.xml
index 24ae2ed..f239ba9 100644
--- a/modules/platforms/cpp/core-test/config/cache-test.xml
+++ b/modules/platforms/cpp/core-test/config/cache-test.xml
@@ -31,7 +31,6 @@
<bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
<property name="localHost" value="127.0.0.1"/>
<property name="connectorConfiguration"><null/></property>
- <property name="odbcConfiguration"><null/></property>
<property name="includeEventTypes">
<util:constant static-field="org.apache.ignite.events.EventType.EVTS_CACHE"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/607609d5/modules/platforms/cpp/examples/odbc-example/config/example-odbc.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/examples/odbc-example/config/example-odbc.xml b/modules/platforms/cpp/examples/odbc-example/config/example-odbc.xml
index 51e67e0..db4c390 100644
--- a/modules/platforms/cpp/examples/odbc-example/config/example-odbc.xml
+++ b/modules/platforms/cpp/examples/odbc-example/config/example-odbc.xml
@@ -27,60 +27,65 @@
http://www.springframework.org/schema/util/spring-util.xsd">
<bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+ <!-- Enabling ODBC. -->
+ <property name="odbcConfiguration">
+ <bean class="org.apache.ignite.configuration.OdbcConfiguration"></bean>
+ </property>
+
<property name="cacheConfiguration">
<list>
<bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="Person"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <!-- Configure type metadata to enable queries. -->
- <property name="typeMetadata">
- <list>
- <bean class="org.apache.ignite.cache.CacheTypeMetadata">
- <property name="keyType" value="java.lang.Long"/>
- <property name="valueType" value="Person"/>
- <property name="ascendingFields">
- <map>
- <entry key="orgId" value="java.lang.Long"/>
- </map>
- </property>
- <property name="queryFields">
- <map>
- <entry key="firstName" value="java.lang.String"/>
- <entry key="lastName" value="java.lang.String"/>
- <entry key="resume" value="java.lang.String"/>
- <entry key="salary" value="java.lang.Double"/>
- </map>
- </property>
- </bean>
- </list>
- </property>
+ <property name="name" value="Person"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <!-- Configure type metadata to enable queries. -->
+ <property name="typeMetadata">
+ <list>
+ <bean class="org.apache.ignite.cache.CacheTypeMetadata">
+ <property name="keyType" value="java.lang.Long"/>
+ <property name="valueType" value="Person"/>
+ <property name="ascendingFields">
+ <map>
+ <entry key="orgId" value="java.lang.Long"/>
+ </map>
+ </property>
+ <property name="queryFields">
+ <map>
+ <entry key="firstName" value="java.lang.String"/>
+ <entry key="lastName" value="java.lang.String"/>
+ <entry key="resume" value="java.lang.String"/>
+ <entry key="salary" value="java.lang.Double"/>
+ </map>
+ </property>
+ </bean>
+ </list>
+ </property>
</bean>
-
- <bean class="org.apache.ignite.configuration.CacheConfiguration">
- <property name="name" value="Organization"/>
- <property name="cacheMode" value="PARTITIONED"/>
- <property name="atomicityMode" value="TRANSACTIONAL"/>
- <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
- <!-- Configure type metadata to enable queries. -->
- <property name="typeMetadata">
- <list>
- <bean class="org.apache.ignite.cache.CacheTypeMetadata">
- <property name="keyType" value="java.lang.Long"/>
- <property name="valueType" value="Organization"/>
- <property name="ascendingFields">
- <map>
- <entry key="name" value="java.lang.String"/>
- </map>
- </property>
- </bean>
- </list>
- </property>
+
+ <bean class="org.apache.ignite.configuration.CacheConfiguration">
+ <property name="name" value="Organization"/>
+ <property name="cacheMode" value="PARTITIONED"/>
+ <property name="atomicityMode" value="TRANSACTIONAL"/>
+ <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+ <!-- Configure type metadata to enable queries. -->
+ <property name="typeMetadata">
+ <list>
+ <bean class="org.apache.ignite.cache.CacheTypeMetadata">
+ <property name="keyType" value="java.lang.Long"/>
+ <property name="valueType" value="Organization"/>
+ <property name="ascendingFields">
+ <map>
+ <entry key="name" value="java.lang.String"/>
+ </map>
+ </property>
+ </bean>
+ </list>
+ </property>
</bean>
- </list>
+ </list>
</property>
<!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
http://git-wip-us.apache.org/repos/asf/ignite/blob/607609d5/modules/platforms/cpp/odbc-test/config/queries-test.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc-test/config/queries-test.xml b/modules/platforms/cpp/odbc-test/config/queries-test.xml
index fa87f82..f08f86d 100644
--- a/modules/platforms/cpp/odbc-test/config/queries-test.xml
+++ b/modules/platforms/cpp/odbc-test/config/queries-test.xml
@@ -29,6 +29,11 @@
<!-- Set to true to enable distributed class loading for examples, default is false. -->
<property name="peerClassLoadingEnabled" value="true"/>
+ <!-- Enabling ODBC. -->
+ <property name="odbcConfiguration">
+ <bean class="org.apache.ignite.configuration.OdbcConfiguration"></bean>
+ </property>
+
<property name="cacheConfiguration">
<list>
<bean class="org.apache.ignite.configuration.CacheConfiguration">