Merge branches ignite-1.6.8 to 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/f30b79c8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f30b79c8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f30b79c8 Branch: refs/heads/ignite-comm-opts1 Commit: f30b79c842cb56c0c12c793852fc630731d0698f Parents: fc6f879 98914fe Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Wed Sep 14 16:15:14 2016 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Wed Sep 14 16:15:14 2016 +0700 ---------------------------------------------------------------------- .../store/jdbc/CacheAbstractJdbcStore.java | 71 ++++-- .../cache/store/jdbc/CacheJdbcPojoStore.java | 21 +- .../java/org/apache/ignite/igfs/IgfsPath.java | 14 +- .../org/apache/ignite/igfs/IgfsPathSummary.java | 3 +- .../local/LocalIgfsSecondaryFileSystem.java | 2 +- .../igfs/common/IgfsControlResponse.java | 19 +- .../internal/igfs/common/IgfsMarshaller.java | 14 +- .../internal/processors/igfs/IgfsAsyncImpl.java | 12 +- .../internal/processors/igfs/IgfsContext.java | 27 +++ .../processors/igfs/IgfsDataManager.java | 19 +- .../ignite/internal/processors/igfs/IgfsEx.java | 18 -- .../internal/processors/igfs/IgfsFileImpl.java | 5 +- .../internal/processors/igfs/IgfsImpl.java | 227 ++++--------------- .../processors/igfs/IgfsInputStreamAdapter.java | 51 ----- .../processors/igfs/IgfsInputStreamImpl.java | 120 +++++----- .../processors/igfs/IgfsIpcHandler.java | 7 +- .../processors/igfs/IgfsModeResolver.java | 3 +- .../processors/igfs/IgfsOutputStreamImpl.java | 8 +- .../internal/processors/igfs/IgfsPathIds.java | 2 +- .../internal/processors/igfs/IgfsPaths.java | 5 +- .../igfs/IgfsSecondaryFileSystemImpl.java | 2 +- .../internal/processors/igfs/IgfsUtils.java | 21 +- .../CacheJdbcPojoStoreAbstractSelfTest.java | 70 +++++- ...heJdbcPojoStoreBinaryMarshallerSelfTest.java | 12 +- .../apache/ignite/igfs/IgfsPathSelfTest.java | 6 - .../igfs/IgfsAbstractBaseSelfTest.java | 2 +- .../processors/igfs/IgfsAbstractSelfTest.java | 12 +- .../igfs/IgfsDataManagerSelfTest.java | 6 +- .../igfs/IgfsDualAbstractSelfTest.java | 28 ++- .../igfs/IgfsMetaManagerSelfTest.java | 4 +- .../processors/igfs/IgfsMetricsSelfTest.java | 21 +- .../internal/processors/igfs/IgfsMock.java | 15 +- .../igfs/IgfsModeResolverSelfTest.java | 4 +- .../processors/igfs/IgfsStreamsSelfTest.java | 4 +- .../hadoop/igfs/HadoopIgfsInProc.java | 12 +- .../hadoop/HadoopCommandLineTest.java | 4 +- .../cpp/odbc/install/ignite-odbc-install.ini | 1 + .../cpp/odbc/install/install_amd64.cmd | 22 +- .../platforms/cpp/odbc/install/install_x86.cmd | 11 +- 39 files changed, 406 insertions(+), 499 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f30b79c8/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f30b79c8/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java index ef4e246,798b84a..b19fdea --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java @@@ -150,9 -150,10 +150,10 @@@ public class CacheJdbcPojoStore<K, V> e ResultSet rs) throws CacheLoaderException { try { JdbcTypeField field = fields[0]; - int colIdx = loadColIdxs.get(field.getDatabaseFieldName()); + + Integer colIdx = columnIndex(loadColIdxs, field.getDatabaseFieldName()); - return getColumnValue(rs, colIdx, field.getJavaFieldType()); + return transformer.getColumnValue(rs, colIdx, field.getJavaFieldType()); } catch (SQLException e) { throw new CacheLoaderException("Failed to read object of class: " + typeName, e); @@@ -196,12 -197,12 +197,12 @@@ throw new IllegalStateException("Failed to find property in POJO class [type=" + typeName + ", prop=" + fldJavaName + "]"); - String fldDbName = fld.getDatabaseFieldName(); + String dbName = fld.getDatabaseFieldName(); - Integer colIdx = loadColIdxs.get(fldDbName); + Integer colIdx = columnIndex(loadColIdxs, dbName); try { - Object colVal = getColumnValue(rs, colIdx, fld.getJavaFieldType()); + Object colVal = transformer.getColumnValue(rs, colIdx, fld.getJavaFieldType()); try { prop.set(obj, colVal); @@@ -245,9 -246,9 +246,9 @@@ Collection<Object> hashValues = calcHash ? new ArrayList<>(hashFields.size()) : null; for (JdbcTypeField field : fields) { - Integer colIdx = loadColIdxs.get(field.getDatabaseFieldName()); + Integer colIdx = columnIndex(loadColIdxs, field.getDatabaseFieldName()); - Object colVal = getColumnValue(rs, colIdx, field.getJavaFieldType()); + Object colVal = transformer.getColumnValue(rs, colIdx, field.getJavaFieldType()); builder.setField(field.getJavaFieldName(), colVal, (Class<Object>)field.getJavaFieldType());
