You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/09/22 09:37:12 UTC
[3/4] ignite git commit: Merge ignite-1.6.9 into ignite-1.7.2.
Merge ignite-1.6.9 into ignite-1.7.2.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/35b74110
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35b74110
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35b74110
Branch: refs/heads/master
Commit: 35b741103045a8098f835fbd0c051f3cfd143d5e
Parents: c8e7938 63888bd
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Sep 22 16:29:03 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Sep 22 16:29:03 2016 +0700
----------------------------------------------------------------------
.../store/jdbc/CacheAbstractJdbcStore.java | 104 ++++--
.../store/jdbc/CacheJdbcPojoStoreFactory.java | 45 ++-
.../store/jdbc/dialect/BasicJdbcDialect.java | 8 +-
.../cache/store/jdbc/dialect/DB2Dialect.java | 6 +-
.../cache/store/jdbc/dialect/H2Dialect.java | 5 +-
.../cache/store/jdbc/dialect/JdbcDialect.java | 18 +-
.../cache/store/jdbc/dialect/MySQLDialect.java | 9 +-
.../cache/store/jdbc/dialect/OracleDialect.java | 5 +-
.../store/jdbc/dialect/SQLServerDialect.java | 14 +-
.../igfs/IgfsAbstractOutputStream.java | 266 ++++++++++++++++
.../internal/processors/igfs/IgfsImpl.java | 27 +-
.../processors/igfs/IgfsOutputStreamImpl.java | 319 ++++---------------
.../igfs/IgfsOutputStreamProxyImpl.java | 163 ++++++++++
.../CacheJdbcPojoStoreAbstractSelfTest.java | 48 ++-
...heJdbcPojoStoreBinaryMarshallerSelfTest.java | 2 +-
...reBinaryMarshallerWithSqlEscapeSelfTest.java | 28 ++
...dbcPojoStoreOptimizedMarshallerSelfTest.java | 2 +-
...ptimizedMarshallerWithSqlEscapeSelfTest.java | 28 ++
.../igfs/IgfsAbstractBaseSelfTest.java | 2 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 +
.../src/test/config/jdbc-pojo-store-builtin.xml | 12 +-
.../src/test/config/jdbc-pojo-store-obj.xml | 12 +-
.../jdbc/CacheJdbcBlobStoreFactorySelfTest.java | 12 +-
.../jdbc/CacheJdbcPojoStoreFactorySelfTest.java | 14 +-
.../store/jdbc/CachePojoStoreXmlSelfTest.java | 13 +-
.../CachePojoStoreXmlWithSqlEscapeSelfTest.java | 28 ++
.../testsuites/IgniteSpringTestSuite.java | 5 +-
27 files changed, 845 insertions(+), 354 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b74110/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
index c75fcc0,a9a8ce1..5f53626
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
@@@ -186,9 -187,9 +186,12 @@@ public abstract class CacheAbstractJdbc
/** Hash calculator. */
protected JdbcTypeHasher hasher = JdbcTypeDefaultHasher.INSTANCE;
+ /** Types transformer. */
+ protected JdbcTypesTransformer transformer = JdbcTypesDefaultTransformer.INSTANCE;
+
+ /** Flag indicating that table and field names should be escaped in all SQL queries created by JDBC POJO store. */
+ private boolean sqlEscapeAll;
+
/**
* Get field value from object for use as query parameter.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b74110/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java
index 32f54fb,8bc6031..154b922
--- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreFactory.java
@@@ -158,7 -158,7 +161,8 @@@ public class CacheJdbcPojoStoreFactory<
store.setParallelLoadCacheMinimumThreshold(parallelLoadCacheMinThreshold);
store.setTypes(types);
store.setHasher(hasher);
+ store.setTransformer(transformer);
+ store.setSqlEscapeAll(sqlEscapeAll);
if (dataSrc != null)
store.setDataSource(dataSrc);
http://git-wip-us.apache.org/repos/asf/ignite/blob/35b74110/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
----------------------------------------------------------------------
diff --cc modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
index 587d46b,c4a4b75..135714f
--- a/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
+++ b/modules/spring/src/test/java/org/apache/ignite/testsuites/IgniteSpringTestSuite.java
@@@ -20,9 -20,10 +20,11 @@@ package org.apache.ignite.testsuites
import junit.framework.TestSuite;
import org.apache.ignite.cache.spring.GridSpringCacheManagerSelfTest;
import org.apache.ignite.cache.spring.SpringCacheManagerContextInjectionTest;
+import org.apache.ignite.internal.IgniteSpringBeanTest;
import org.apache.ignite.cache.store.jdbc.CacheJdbcBlobStoreFactorySelfTest;
import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactorySelfTest;
+ import org.apache.ignite.cache.store.jdbc.CachePojoStoreXmlSelfTest;
+ import org.apache.ignite.cache.store.jdbc.CachePojoStoreXmlWithSqlEscapeSelfTest;
import org.apache.ignite.cache.store.spring.CacheSpringStoreSessionListenerSelfTest;
import org.apache.ignite.internal.GridFactorySelfTest;
import org.apache.ignite.internal.GridSpringBeanSerializationSelfTest;