ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [28/50] [abbrv] ignite git commit: Merge ignite-1.8.2.
Date Mon, 26 Dec 2016 11:16:44 GMT
Merge ignite-1.8.2.


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

Branch: refs/heads/ignite-2.0
Commit: 1b2afbb8d4032d23ee9a78987aec90a42e886700
Parents: 41dddb8 8372e69
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Dec 22 16:51:00 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Dec 22 16:51:00 2016 +0300

----------------------------------------------------------------------
 .../store/cassandra/CassandraCacheStore.java    |   6 +
 .../store/cassandra/datasource/DataSource.java  |   9 +
 .../java/org/apache/ignite/IgniteServices.java  |  16 +
 .../ignite/cache/store/CacheStoreAdapter.java   |   6 +
 .../cache/store/jdbc/CacheJdbcPojoStore.java    |  19 +-
 .../store/jdbc/JdbcTypesDefaultTransformer.java | 112 ++--
 .../org/apache/ignite/internal/GridTopic.java   |   8 +-
 .../ignite/internal/IgniteServicesImpl.java     |   9 +-
 .../internal/binary/BinaryClassDescriptor.java  |  12 +-
 .../ignite/internal/binary/BinaryUtils.java     |  10 +-
 .../binary/builder/BinaryObjectBuilderImpl.java |  11 +-
 .../affinity/GridAffinityProcessor.java         |   2 +-
 .../cache/CacheStoreBalancingWrapper.java       |   6 +
 .../processors/cache/GridCacheAdapter.java      |   8 +-
 .../cache/GridCacheLoaderWriterStore.java       |   6 +
 .../GridCachePartitionExchangeManager.java      |  23 +-
 .../CacheDataStructuresManager.java             |   6 +-
 .../cache/query/GridCacheQueryManager.java      |   4 +-
 .../closure/GridClosureProcessor.java           |  31 +-
 .../internal/processors/job/GridJobWorker.java  |  76 ++-
 .../processors/odbc/OdbcRequestHandler.java     |  14 +-
 .../platform/PlatformContextImpl.java           |   2 +-
 .../dotnet/PlatformDotNetCacheStore.java        |  11 +
 .../platform/services/PlatformServices.java     |   2 +-
 .../platform/utils/PlatformUtils.java           |  28 +
 .../service/GridServiceProcessor.java           |  11 +-
 .../processors/service/GridServiceProxy.java    |  18 +-
 .../processors/task/GridTaskWorker.java         |   7 +
 .../communication/tcp/TcpCommunicationSpi.java  |   4 +-
 .../jdbc/JdbcTypesDefaultTransformerTest.java   | 283 +++++++++
 .../IgniteComputeTopologyExceptionTest.java     |   5 +-
 .../binary/BinaryMarshallerSelfTest.java        |  66 ++
 ...heapCacheMetricsForClusterGroupSelfTest.java | 141 +++++
 .../CacheOffHeapAndSwapMetricsSelfTest.java     | 621 -------------------
 ...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 621 +++++++++++++++++++
 .../closure/GridClosureSerializationTest.java   | 177 ++++++
 ...gniteServiceProxyTimeoutInitializedTest.java | 284 +++++++++
 .../ignite/testsuites/IgniteBasicTestSuite.java |   2 +
 .../IgniteCacheMetricsSelfTestSuite.java        |   6 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../testsuites/IgniteKernalSelfTestSuite.java   |   2 +
 .../processors/query/h2/IgniteH2Indexing.java   |  75 +--
 ...niteCachePartitionedFieldsQuerySelfTest.java |  25 +
 43 files changed, 2008 insertions(+), 779 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1b2afbb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1b2afbb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1b2afbb8/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequestHandler.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequestHandler.java
index ea3ae8b,c6b41d2..2e0fd10
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequestHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/OdbcRequestHandler.java
@@@ -198,13 -198,19 +198,19 @@@ public class OdbcRequestHandler 
              qry.setDistributedJoins(distributedJoins);
              qry.setEnforceJoinOrder(enforceJoinOrder);
  
-             IgniteCache<Object, Object> cache = ctx.grid().cache(req.cacheName());
+             IgniteCache<Object, Object> cache0 = ctx.grid().cache(req.cacheName());
+ 
+             if (cache0 == null)
+                 return new OdbcResponse(OdbcResponse.STATUS_FAILED,
 -                        "Cache doesn't exist (did you configure it?): " + req.cacheName());
++                    "Cache doesn't exist (did you configure it?): " + req.cacheName());
+ 
+             IgniteCache<Object, Object> cache = cache0.withKeepBinary();
  
              if (cache == null)
-                 return new OdbcResponse(OdbcResponse.STATUS_FAILED, "Cache doesn't exist
(did you configure it?): " +
-                     req.cacheName());
+                 return new OdbcResponse(OdbcResponse.STATUS_FAILED,
+                     "Can not get cache with keep binary: " + req.cacheName());
  
-             QueryCursor qryCur = cache.withKeepBinary().query(qry);
+             QueryCursor qryCur = cache.query(qry);
  
              qryCursors.put(qryId, new IgniteBiTuple<QueryCursor, Iterator>(qryCur,
null));
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/1b2afbb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/1b2afbb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
index 22a7fa2,c266986..37727f5
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformServices.java
@@@ -341,10 -340,10 +341,10 @@@ public class PlatformServices extends P
  
                  Object proxy = PlatformService.class.isAssignableFrom(d.serviceClass())
                      ? services.serviceProxy(name, PlatformService.class, sticky)
-                     : new GridServiceProxy<>(services.clusterGroup(), name, Service.class,
sticky,
+                     : new GridServiceProxy<>(services.clusterGroup(), name, Service.class,
sticky, 0,
                          platformCtx.kernalContext());
  
 -                return new ServiceProxyHolder(proxy, d.serviceClass());
 +                return new ServiceProxyHolder(proxy, d.serviceClass(), platformContext());
              }
          }
          return super.processInStreamOutObject(type, reader);

http://git-wip-us.apache.org/repos/asf/ignite/blob/1b2afbb8/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java
----------------------------------------------------------------------


Mime
View raw message