ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [2/2] ignite git commit: Merge branches 'ignite-1282' and 'ignite-1753-1282' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1753-1282
Date Tue, 17 Nov 2015 03:02:16 GMT
Merge branches 'ignite-1282' and 'ignite-1753-1282' of https://git-wip-us.apache.org/repos/asf/ignite
into ignite-1753-1282


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dbf83b9b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dbf83b9b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dbf83b9b

Branch: refs/heads/ignite-1753-1282
Commit: dbf83b9b47850a89a11a5d302eea22bc6555bed6
Parents: 25292c7 c47eb9e
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Tue Nov 17 10:01:31 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Tue Nov 17 10:01:31 2015 +0700

----------------------------------------------------------------------
 config/ignite-log4j2.xml~                       |  65 --
 .../store/jdbc/CacheAbstractJdbcStore.java      | 675 ++++++++++++-------
 .../store/jdbc/CacheJdbcBlobStoreFactory.java   |  14 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java    | 444 ++++++++----
 .../store/jdbc/CacheJdbcPojoStoreFactory.java   | 277 +++++++-
 .../ignite/cache/store/jdbc/JdbcType.java       | 255 +++++++
 .../cache/store/jdbc/JdbcTypeDefaultHasher.java |  43 ++
 .../ignite/cache/store/jdbc/JdbcTypeField.java  | 172 +++++
 .../ignite/cache/store/jdbc/JdbcTypeHasher.java |  34 +
 .../processors/query/GridQueryProcessor.java    |   6 +-
 .../ignite/internal/visor/cache/VisorCache.java |   4 +-
 .../apache/ignite/lang/IgniteExperimental.java  |  39 ++
 modules/core/src/test/config/log4j2-test.xml~   |  63 --
 .../CacheJdbcPojoStoreAbstractSelfTest.java     | 395 +++++++++++
 ...dbcPojoStoreOptimizedMarshallerSelfTest.java |  31 +
 ...JdbcPojoStorePortableMarshallerSelfTest.java |  85 +++
 .../store/jdbc/CacheJdbcPojoStoreTest.java      | 200 +++---
 ...eJdbcStoreAbstractMultithreadedSelfTest.java |   2 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   6 +-
 modules/log4j2/pom.xml~                         |  45 --
 .../log4j2/GridLog4j2CorrectFileNameTest.java~  |  95 ---
 .../log4j2/GridLog4j2InitializedTest.java~      |  79 ---
 .../log4j2/GridLog4j2LoggingFileTest.java~      |  74 --
 .../yardstick/config/benchmark-store.properties |  86 ++-
 .../yardstick/config/ignite-store-config.xml    |  81 +--
 .../org/apache/ignite/yardstick/IgniteNode.java |  23 +-
 .../yardstick/cache/model/Organization.java     |   2 +-
 .../ignite/yardstick/cache/model/Person.java    |   2 +-
 .../ignite/yardstick/cache/model/SampleKey.java |   2 +-
 .../yardstick/cache/model/SampleValue.java      |   2 +-
 30 files changed, 2284 insertions(+), 1017 deletions(-)
----------------------------------------------------------------------



Mime
View raw message