subject:"\[50\/50\] \[abbrv\] ignite git commit\: Merge remote\-tracking branch 'remotes\/origin\/ignite\-1.5'"

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-961

2015-12-28 Thread sboikov

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-961

Conflicts:
examples/pom.xml

modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java

modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java

modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java

modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java

modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java

modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java

modules/core/src/main/java/org/apache/ignite/internal/util/GridJavaProcess.java

modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
parent/pom.xml
pom.xml


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

Branch: refs/heads/ignite-961
Commit: 2139ef050580941331132f58bc693352cbb1e233
Parents: ec3819f
Author: sboikov 
Authored: Mon Dec 28 17:19:46 2015 +0300
Committer: sboikov 
Committed: Mon Dec 28 17:19:46 2015 +0300

--
 .../ignite/internal/GridKernalContext.java  |  2 +
 .../ignite/internal/GridKernalContextImpl.java  |  2 +
 .../apache/ignite/internal/IgniteKernal.java|  1 +
 .../processors/query/GridQueryProcessor.java| 80 +---
 .../processors/rest/GridRestProcessor.java  |  3 +-
 .../IgniteScriptingCommandHandler.java  |  2 +-
 .../ignite/internal/util/GridJavaProcess.java   | 26 +--
 modules/json/pom.xml|  3 +-
 .../processors/json/JsonCacheObject.java| 15 +++-
 modules/nodejs/pom.xml  |  2 +-
 .../http/jetty/GridJettyRestHandler.java|  9 ++-
 11 files changed, 51 insertions(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2139ef05/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java 
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index f813b04..c7f68f4 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -48,6 +48,7 @@ import org.apache.ignite.internal.processors.igfs.IgfsHelper;
 import org.apache.ignite.internal.processors.igfs.IgfsProcessorAdapter;
 import org.apache.ignite.internal.processors.job.GridJobProcessor;
 import 
org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsProcessor;
+import org.apache.ignite.internal.processors.json.IgniteJsonProcessor;
 import org.apache.ignite.internal.processors.offheap.GridOffHeapProcessor;
 import org.apache.ignite.internal.processors.platform.PlatformProcessor;
 import org.apache.ignite.internal.processors.plugin.IgnitePluginProcessor;
@@ -56,6 +57,7 @@ import 
org.apache.ignite.internal.processors.query.GridQueryProcessor;
 import org.apache.ignite.internal.processors.resource.GridResourceProcessor;
 import org.apache.ignite.internal.processors.rest.GridRestProcessor;
 import 
org.apache.ignite.internal.processors.schedule.IgniteScheduleProcessorAdapter;
+import 
org.apache.ignite.internal.processors.scripting.IgniteScriptingProcessor;
 import org.apache.ignite.internal.processors.security.GridSecurityProcessor;
 import 
org.apache.ignite.internal.processors.segmentation.GridSegmentationProcessor;
 import org.apache.ignite.internal.processors.service.GridServiceProcessor;

http://git-wip-us.apache.org/repos/asf/ignite/blob/2139ef05/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index b2d5033..194d068 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -64,6 +64,7 @@ import org.apache.ignite.internal.processors.igfs.IgfsHelper;
 import

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5'

2015-12-24 Thread av

Merge remote-tracking branch 'remotes/origin/ignite-1.5'


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

Branch: refs/heads/master
Commit: 36261adfc87ae8c0e356b2add0160282f4164398
Parents: 0766ad7 debe34d
Author: Anton Vinogradov 
Authored: Thu Dec 24 13:56:45 2015 +0300
Committer: Anton Vinogradov 
Committed: Thu Dec 24 13:56:45 2015 +0300

--
 README.txt  |   4 +-
 RELEASE_NOTES.txt   |   1 +
 assembly/dependencies-fabric-lgpl.xml   |   7 +
 assembly/dependencies-fabric.xml|   7 +
 assembly/release-fabric-base.xml|   4 +-
 bin/ignitevisorcmd.bat  |   1 +
 examples/pom.xml|   2 +-
 examples/schema-import/pom.xml  |   2 +-
 .../hibernate/CacheHibernateStoreExample.java   |   8 +
 .../datagrid/store/hibernate/Person.hbm.xml |   6 +-
 .../datagrid/store/hibernate/hibernate.cfg.xml  |   7 +-
 ...ComputeClientBinaryTaskExecutionExample.java |   4 +-
 .../CacheClientBinaryPutGetExample.java |  12 +-
 .../datagrid/CacheClientBinaryQueryExample.java |  17 +-
 .../store/auto/CacheBinaryAutoStoreExample.java |   9 +-
 .../datagrid/CacheEntryProcessorExample.java| 157 ++
 .../examples/datagrid/CacheQueryExample.java|  15 +-
 .../starschema/CacheStarSchemaExample.java  |   9 +-
 .../store/dummy/CacheDummyPersonStore.java  | 113 -
 .../store/dummy/CacheDummyStoreExample.java | 133 -
 .../datagrid/store/dummy/package-info.java  |  22 -
 .../store/jdbc/CacheJdbcPersonStore.java|  43 +-
 .../store/jdbc/CacheJdbcStoreExample.java   |  24 +-
 .../store/spring/CacheSpringPersonStore.java|  29 +-
 .../store/spring/CacheSpringStoreExample.java   |  12 +-
 .../datagrid/store/spring/package-info.java |   2 +-
 .../apache/ignite/examples/model/Address.java   |  72 +++
 .../apache/ignite/examples/model/Employee.java  |  93 
 .../ignite/examples/model/EmployeeKey.java  |  93 
 .../ignite/examples/model/Organization.java |  85 +++-
 .../ignite/examples/model/OrganizationType.java |  32 ++
 .../apache/ignite/examples/model/Person.java|   2 +-
 .../ignite/examples/model/binary/Address.java   |  72 ---
 .../ignite/examples/model/binary/Employee.java  |  93 
 .../examples/model/binary/EmployeeKey.java  |  93 
 .../examples/model/binary/Organization.java |  93 
 .../examples/model/binary/OrganizationType.java |  32 --
 .../ignite/examples/model/package-info.java |  23 +
 .../streaming/StreamVisitorExample.java |  40 +-
 .../datagrid/CacheEntryProcessorExample.java| 147 ++
 .../ScalarCacheEntryProcessorExample.scala  | 125 +
 .../examples/ScalarSnowflakeSchemaExample.scala |  31 +-
 .../ignite/examples/CacheExamplesSelfTest.java  |  18 +-
 .../java8/examples/CacheExamplesSelfTest.java   |   8 +
 .../tests/examples/ScalarExamplesSelfTest.scala |   5 +
 modules/aop/pom.xml |   2 +-
 .../apache/ignite/gridify/AbstractAopTest.java  |  32 +-
 modules/apache-license-gen/pom.xml  |   2 +-
 modules/aws/pom.xml |   2 +-
 modules/camel/pom.xml   |   2 +-
 modules/clients/pom.xml |  62 ++-
 .../ClientAbstractConnectivitySelfTest.java |   2 +-
 .../JettyRestProcessorAbstractSelfTest.java |  25 +-
 modules/cloud/pom.xml   |   2 +-
 modules/codegen/pom.xml |   2 +-
 modules/core/pom.xml|   7 +-
 .../src/main/java/org/apache/ignite/Ignite.java |  19 +
 .../java/org/apache/ignite/IgniteCache.java |   8 +-
 .../org/apache/ignite/binary/BinaryObject.java  |  15 +
 .../binary/BinaryReflectiveSerializer.java  |  33 ++
 .../ignite/binary/BinaryTypeConfiguration.java  |  20 +-
 .../org/apache/ignite/cache/CacheManager.java   |   4 +-
 .../ignite/cache/affinity/AffinityKey.java  |   2 +-
 .../store/jdbc/CacheAbstractJdbcStore.java  |   2 +-
 .../configuration/CacheConfiguration.java   |  63 ++-
 .../apache/ignite/internal/IgniteKernal.java|  36 +-
 .../ignite/internal/IgniteVersionUtils.java |   5 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |  51 +-
 .../internal/binary/BinaryClassDescriptor.java  | 181 ---
 .../ignite/internal/binary/BinaryContext.java   | 123 -
 .../internal/binary/BinaryEnumObjectImpl.java   |   7 +
 .../internal/binary/BinaryFieldAccessor.java|   3 -
 .../ignite/internal/binary/BinaryMetadata.java  |  91 +++-
 .../internal/binary/BinaryObjectExImpl.java |   7 +

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1

2015-12-08 Thread sboikov

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1

Conflicts:
benchmarks/cache-comparison/pom.xml
benchmarks/filesystem/hadoop1/pom.xml
benchmarks/filesystem/hadoop2/pom.xml
benchmarks/mongo/pom.xml
benchmarks/risk-analytics/pom.xml
benchmarks/serialization/pom.xml

benchmarks/yardstick/src/main/dotnet/gridgain-benchmarks/Properties/AssemblyInfo.cs
examples/pom.xml
modules/clients/pom.xml
modules/codegen/pom.xml
modules/compatibility/pom.xml
modules/core/pom.xml
modules/core/src/main/resources/gridgain.properties
modules/diagnostic/pom.xml
modules/dr-demo/pom.xml
modules/license-gen/pom.xml
modules/mongo-sniffer/pom.xml
modules/mongo-visor/pom.xml
modules/mongo/pom.xml
modules/platforms/cpp/core-test/configure.ac
modules/platforms/cpp/core/configure.ac
modules/platforms/cpp/examples/configure.ac

modules/platforms/dotnet/examples/GridGainExamples/Properties/AssemblyInfo.cs

modules/platforms/dotnet/examples/GridGainExamplesDll/Properties/AssemblyInfo.cs

modules/platforms/dotnet/gridgain-examples-test/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-exe/Properties/AssemblyInfo.cs

modules/platforms/dotnet/gridgain-test-compatibility/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-test-dll/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-test-runner/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain-test/Properties/AssemblyInfo.cs
modules/platforms/dotnet/gridgain/Properties/AssemblyInfo.cs
modules/tools/pom.xml
modules/visor-console/pom.xml
modules/visor-demo/pom.xml
modules/visor-tester-plugin/pom.xml
modules/visor-tester/pom.xml
modules/visor/pom.xml
modules/yardstick/dotnet/Properties/AssemblyInfo.cs
modules/yardstick/pom.xml
parent/pom.xml
pilots/chronotrack/pom.xml
pilots/ctb/pom.xml
pilots/dsi/pom.xml
pilots/ionic/pom.xml
pilots/sb/pom.xml
pilots/sony/pom.xml
pilots/wellsfargo/pom.xml
pilots/worldpay/pom.xml
pom.xml

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1

Conflicts:
examples/pom.xml
examples/schema-import/pom.xml
modules/aop/pom.xml
modules/apache-license-gen/pom.xml
modules/aws/pom.xml
modules/camel/pom.xml
modules/clients/pom.xml
modules/cloud/pom.xml
modules/codegen/pom.xml
modules/core/pom.xml

modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
modules/core/src/main/resources/ignite.properties
modules/extdata/p2p/pom.xml
modules/extdata/uri/modules/uri-dependency/pom.xml
modules/extdata/uri/pom.xml
modules/flume/pom.xml
modules/gce/pom.xml
modules/geospatial/pom.xml
modules/hadoop/pom.xml
modules/hibernate/pom.xml
modules/indexing/pom.xml
modules/jcl/pom.xml
modules/jms11/pom.xml
modules/jta/pom.xml
modules/kafka/pom.xml
modules/log4j/pom.xml
modules/log4j2/pom.xml
modules/mesos/pom.xml
modules/mqtt/pom.xml
modules/platforms/cpp/common/configure.ac
modules/platforms/cpp/core-test/configure.ac
modules/platforms/cpp/core/configure.ac
modules/platforms/cpp/examples/configure.ac
modules/platforms/cpp/ignite/configure.ac

modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs

modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs

modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs

modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs

modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
modules/rest-http/pom.xml
modules/scalar-2.10/pom.xml
modules/scalar/pom.xml
modules/schedule/pom.xml
modules/schema-import/pom.xml
modules/slf4j/pom.xml
modules/spark-2.10/pom.xml
modules/spark/pom.xml
modules/spring/pom.xml
modules/ssh/pom.xml
modules/tools/pom.xml
modules/twitter/pom.xml
modules/urideploy/pom.xml
modules/visor-console-2.10/pom.xml
modules/visor-console/pom.xml
modules/visor-plugins/pom.xml
modules/web/pom.xml
modules/yardstick/pom.xml
modules/yarn/pom.xml
modules/zookeeper/pom.xml
pom.xml


Project:

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5'

2015-12-07 Thread sboikov

Merge remote-tracking branch 'remotes/origin/ignite-1.5'

Conflicts:

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java


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

Branch: refs/heads/master
Commit: 3fbf3e9544329210c5e59be3f3ada13ac51a4482
Parents: 357d791 11b4262
Author: Anton Vinogradov 
Authored: Mon Dec 7 13:52:27 2015 +0300
Committer: Anton Vinogradov 
Committed: Mon Dec 7 13:52:27 2015 +0300

--
 RELEASE_NOTES.txt   |   3 +
 examples/config/example-default.xml |   7 +
 examples/pom.xml|   7 +-
 examples/schema-import/pom.xml  |   4 +-
 .../store/auto/CacheBinaryAutoStoreExample.java | 158 
 .../datagrid/store/auto/package-info.java   |  22 ++
 .../store/auto/CacheAutoStoreExample.java   |  93 -
 .../auto/CacheAutoStoreLoadDataExample.java |  85 -
 .../datagrid/store/auto/CacheConfig.java|  81 
 .../datagrid/store/auto/DbH2ServerStartup.java  |  79 
 .../ignite/examples/util/DbH2ServerStartup.java |  79 
 .../ignite/examples/util/package-info.java  |  22 ++
 modules/aop/pom.xml |  14 +-
 modules/apache-license-gen/pom.xml  |   2 +-
 modules/aws/pom.xml |  20 +-
 modules/camel/pom.xml   |  16 +-
 modules/clients/pom.xml |   2 +-
 modules/cloud/pom.xml   |   2 +-
 modules/codegen/pom.xml |   2 +-
 modules/core/pom.xml|  30 +-
 .../store/jdbc/CacheAbstractJdbcStore.java  |  12 +-
 .../cache/store/jdbc/CacheJdbcPojoStore.java|   9 +
 .../configuration/IgniteConfiguration.java  |   4 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   4 +-
 .../ignite/internal/MarshallerContextImpl.java  |   7 +-
 .../GridDeploymentPerVersionStore.java  |  12 +-
 .../internal/portable/BinaryFieldAccessor.java  |  83 -
 .../internal/portable/BinaryReaderExImpl.java   |  13 +-
 .../internal/portable/BinaryWriterExImpl.java   |   5 +-
 .../internal/portable/PortableContext.java  |  34 +-
 .../CacheDefaultBinaryAffinityKeyMapper.java|  19 +-
 .../processors/cache/GridCacheAdapter.java  |   8 +-
 .../processors/cache/GridCacheContext.java  |  67 +++-
 .../GridCacheDefaultAffinityKeyMapper.java  |   9 +-
 .../processors/cache/GridCacheIoManager.java|   2 +-
 .../processors/cache/GridCacheMapEntry.java |   6 +-
 .../GridCachePartitionExchangeManager.java  |  40 +-
 .../processors/cache/GridCachePreloader.java|  16 +-
 .../cache/GridCachePreloaderAdapter.java|   7 +-
 .../processors/cache/GridCacheProcessor.java|  14 +-
 .../processors/cache/GridCacheProxyImpl.java|  12 +
 .../processors/cache/IgniteCacheProxy.java  |  24 ++
 .../processors/cache/IgniteInternalCache.java   |   9 +
 .../CacheDataStructuresManager.java |  31 +-
 .../distributed/dht/GridDhtLockFuture.java  |  17 +-
 .../dht/atomic/GridDhtAtomicCache.java  |  24 +-
 .../dht/preloader/GridDhtPartitionDemander.java |  71 ++--
 .../GridDhtPartitionsExchangeFuture.java|   9 +-
 .../dht/preloader/GridDhtPreloader.java |  31 +-
 .../preloader/GridDhtPreloaderAssignments.java  |  19 +-
 .../distributed/near/GridNearGetFuture.java |  12 +-
 .../CacheObjectBinaryProcessorImpl.java |  15 +-
 .../cache/query/GridCacheQueryManager.java  |  12 +-
 .../cache/transactions/IgniteTxHandler.java |   2 +-
 .../transactions/IgniteTxLocalAdapter.java  |  11 +-
 .../datastructures/CollocatedQueueItemKey.java  |  75 
 .../datastructures/CollocatedSetItemKey.java|  87 +
 .../datastructures/DataStructuresProcessor.java |   7 +-
 .../GridAtomicCacheQueueImpl.java   |   8 +-
 .../datastructures/GridCacheQueueAdapter.java   |  30 +-
 .../datastructures/GridCacheQueueItemKey.java   |   9 +-
 .../datastructures/GridCacheSetImpl.java|  37 +-
 .../datastructures/GridCacheSetItemKey.java |  21 +-
 .../GridTransactionalCacheQueueImpl.java|   2 +-
 .../processors/datastructures/QueueItemKey.java |  27 ++
 .../processors/datastructures/SetItemKey.java   |  36 ++
 .../handlers/query/QueryCommandHandler.java |   8 +-
 .../ignite/internal/util/IgniteUtils.java   |   8 +
 .../communication/tcp/TcpCommunicationSpi.java  |  18 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java  |   2 -
 .../core/src/main/resources/ignite.properties   |   2 +-

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5'

2015-11-24 Thread sboikov

Merge remote-tracking branch 'remotes/origin/ignite-1.5'

Conflicts:

modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java


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

Branch: refs/heads/master
Commit: c88ab6ffe496032d13ed442e64eb09c3e12b481c
Parents: a144b84 1136933
Author: Anton Vinogradov 
Authored: Tue Nov 24 12:16:05 2015 +0300
Committer: Anton Vinogradov 
Committed: Tue Nov 24 12:16:05 2015 +0300

--
 .gitignore  |6 +
 assembly/release-fabric-base.xml|   94 +
 .../config/binary/example-ignite-binary.xml |   44 +
 examples/config/example-default.xml |   76 +
 examples/config/example-ignite.xml  |   56 +-
 examples/schema-import/bin/db-init.sql  |3 +-
 .../org/apache/ignite/schema/CacheConfig.java   |7 +-
 .../java/org/apache/ignite/schema/Demo.java |   20 +-
 .../apache/ignite/examples/binary/Address.java  |   72 +
 .../apache/ignite/examples/binary/Employee.java |   93 +
 .../ignite/examples/binary/EmployeeKey.java |   90 +
 .../binary/ExampleBinaryNodeStartup.java|   36 +
 .../ignite/examples/binary/Organization.java|   93 +
 .../examples/binary/OrganizationType.java   |   32 +
 ...ComputeClientBinaryTaskExecutionExample.java |  153 +
 .../binary/computegrid/ComputeClientTask.java   |  116 +
 .../binary/computegrid/package-info.java|   21 +
 .../CacheClientBinaryPutGetExample.java |  230 ++
 .../datagrid/CacheClientBinaryQueryExample.java |  330 ++
 .../examples/binary/datagrid/package-info.java  |   21 +
 .../ignite/examples/binary/package-info.java|   21 +
 .../CacheClientPortableExampleTest.java |   46 +
 .../ComputeClientPortableExampleTest.java   |   37 +
 .../testsuites/IgniteExamplesSelfTestSuite.java |6 +
 .../ignite/codegen/MessageCodeGenerator.java|   11 +-
 modules/core/pom.xml|   21 +
 ...processors.platform.PlatformBootstrapFactory |2 +
 .../src/main/java/org/apache/ignite/Ignite.java |7 +
 .../java/org/apache/ignite/IgniteBinary.java|  357 ++
 .../java/org/apache/ignite/IgniteCache.java |   41 +
 .../org/apache/ignite/IgniteDataStreamer.java   |   16 +
 .../org/apache/ignite/binary/BinaryField.java   |   46 +
 .../apache/ignite/binary/BinaryIdMapper.java|   54 +
 .../binary/BinaryInvalidTypeException.java  |   58 +
 .../org/apache/ignite/binary/BinaryObject.java  |  149 +
 .../ignite/binary/BinaryObjectBuilder.java  |  135 +
 .../ignite/binary/BinaryObjectException.java|   57 +
 .../apache/ignite/binary/BinaryRawReader.java   |  240 ++
 .../apache/ignite/binary/BinaryRawWriter.java   |  225 ++
 .../org/apache/ignite/binary/BinaryReader.java  |  290 ++
 .../apache/ignite/binary/BinarySerializer.java  |   47 +
 .../org/apache/ignite/binary/BinaryType.java|   68 +
 .../ignite/binary/BinaryTypeConfiguration.java  |  112 +
 .../org/apache/ignite/binary/BinaryWriter.java  |  273 ++
 .../org/apache/ignite/binary/Binarylizable.java |   48 +
 .../org/apache/ignite/binary/package-info.java  |   22 +
 .../ignite/cache/CacheKeyConfiguration.java |   92 +
 .../apache/ignite/cache/CacheTypeMetadata.java  |   67 +-
 .../org/apache/ignite/cache/QueryEntity.java|  217 ++
 .../org/apache/ignite/cache/QueryIndex.java |  227 ++
 .../org/apache/ignite/cache/QueryIndexType.java |   38 +
 .../store/jdbc/CacheAbstractJdbcStore.java  |  638 ++-
 .../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 +
 .../configuration/BinaryConfiguration.java  |  139 +
 .../configuration/CacheConfiguration.java   |  692 +++-
 .../configuration/IgniteConfiguration.java  |   75 +-
 .../configuration/PlatformConfiguration.java|   25 +
 .../internal/GridEventConsumeHandler.java   |6 +-
 .../ignite/internal/GridKernalContextImpl.java  |4 +-
 .../internal/GridMessageListenHandler.java  |6 +-
 .../org/apache/ignite/internal/IgniteEx.java|9 -
 .../apache/ignite/internal/IgniteKernal.java|   39 +-
 .../ignite/internal/IgniteNodeAttributes.java   |6 +
 .../internal/client/GridClientCompute.java  |2 +-
 .../impl/connection/GridClientConnection.java   |2 +-
 .../GridClientConnectionManagerAdapter.java |2 +-

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-sql-opt

2015-11-22 Thread sboikov

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-sql-opt


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

Branch: refs/heads/ignite-sql-opt
Commit: 1be4732b0f5ffdcac9abc140a20054c7cfaa68b1
Parents: 8030bbd 15877a8
Author: sboikov 
Authored: Mon Nov 23 09:29:09 2015 +0300
Committer: sboikov 
Committed: Mon Nov 23 09:29:09 2015 +0300

--
 .gitignore  |6 +
 assembly/release-fabric-base.xml|   94 +
 .../config/binary/example-ignite-binary.xml |   44 +
 examples/config/example-default.xml |   76 +
 examples/config/example-ignite.xml  |   56 +-
 .../apache/ignite/examples/binary/Address.java  |   72 +
 .../apache/ignite/examples/binary/Employee.java |   93 +
 .../ignite/examples/binary/EmployeeKey.java |   90 +
 .../binary/ExampleBinaryNodeStartup.java|   36 +
 .../ignite/examples/binary/Organization.java|   93 +
 .../examples/binary/OrganizationType.java   |   32 +
 ...ComputeClientBinaryTaskExecutionExample.java |  153 +
 .../binary/computegrid/ComputeClientTask.java   |  116 +
 .../binary/computegrid/package-info.java|   21 +
 .../CacheClientBinaryPutGetExample.java |  230 ++
 .../datagrid/CacheClientBinaryQueryExample.java |  330 ++
 .../examples/binary/datagrid/package-info.java  |   21 +
 .../ignite/examples/binary/package-info.java|   21 +
 .../datastructures/IgniteSemaphoreExample.java  |  168 +
 .../CacheClientPortableExampleTest.java |   46 +
 .../ignite/examples/CacheExamplesSelfTest.java  |   10 +-
 .../ComputeClientPortableExampleTest.java   |   37 +
 .../testsuites/IgniteExamplesSelfTestSuite.java |6 +
 .../stream/camel/IgniteCamelStreamerTest.java   |   16 +-
 .../camel/IgniteCamelStreamerTestSuite.java |1 -
 .../ignite/codegen/MessageCodeGenerator.java|   11 +-
 modules/core/pom.xml|   21 +
 ...processors.platform.PlatformBootstrapFactory |2 +
 .../src/main/java/org/apache/ignite/Ignite.java |   24 +
 .../java/org/apache/ignite/IgniteBinary.java|  357 ++
 .../java/org/apache/ignite/IgniteCache.java |   41 +
 .../org/apache/ignite/IgniteDataStreamer.java   |   16 +
 .../java/org/apache/ignite/IgniteSemaphore.java |  312 ++
 .../org/apache/ignite/binary/BinaryField.java   |   46 +
 .../apache/ignite/binary/BinaryIdMapper.java|   54 +
 .../binary/BinaryInvalidTypeException.java  |   58 +
 .../org/apache/ignite/binary/BinaryObject.java  |  149 +
 .../ignite/binary/BinaryObjectBuilder.java  |  135 +
 .../ignite/binary/BinaryObjectException.java|   57 +
 .../apache/ignite/binary/BinaryRawReader.java   |  240 ++
 .../apache/ignite/binary/BinaryRawWriter.java   |  225 ++
 .../org/apache/ignite/binary/BinaryReader.java  |  290 ++
 .../apache/ignite/binary/BinarySerializer.java  |   47 +
 .../org/apache/ignite/binary/BinaryType.java|   68 +
 .../ignite/binary/BinaryTypeConfiguration.java  |  112 +
 .../org/apache/ignite/binary/BinaryWriter.java  |  273 ++
 .../org/apache/ignite/binary/Binarylizable.java |   48 +
 .../org/apache/ignite/binary/package-info.java  |   22 +
 .../ignite/cache/CacheKeyConfiguration.java |   92 +
 .../apache/ignite/cache/CacheTypeMetadata.java  |   67 +-
 .../org/apache/ignite/cache/QueryEntity.java|  217 ++
 .../org/apache/ignite/cache/QueryIndex.java |  192 +
 .../org/apache/ignite/cache/QueryIndexType.java |   38 +
 .../configuration/BinaryConfiguration.java  |  139 +
 .../configuration/CacheConfiguration.java   |  692 +++-
 .../configuration/IgniteConfiguration.java  |   75 +-
 .../configuration/PlatformConfiguration.java|   25 +
 .../apache/ignite/events/DiscoveryEvent.java|6 +-
 .../ignite/internal/GridKernalContextImpl.java  |4 +-
 .../org/apache/ignite/internal/IgniteEx.java|9 -
 .../apache/ignite/internal/IgniteKernal.java|   60 +-
 .../ignite/internal/IgniteNodeAttributes.java   |6 +
 .../internal/MarshallerContextAdapter.java  |4 +-
 .../internal/client/GridClientCompute.java  |2 +-
 .../impl/connection/GridClientConnection.java   |2 +-
 .../GridClientConnectionManagerAdapter.java |2 +-
 .../connection/GridClientNioTcpConnection.java  |6 +-
 .../internal/direct/DirectByteBufferStream.java | 1499 ---
 .../internal/direct/DirectMessageReader.java|  144 +-
 .../internal/direct/DirectMessageWriter.java|   65 +-
 .../direct/DirectMessageWriterState.java|  123 -
 .../direct/state/DirectMessageState.java|   98 +
 .../direct/state/DirectMessageStateItem.java|   28 +

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1758-debug

2015-11-10 Thread sboikov

Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1758-debug


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

Branch: refs/heads/ignite-1758-debug
Commit: e7723fe16effb8933533f8b4993c3963349a284b
Parents: d008063
Author: sboikov 
Authored: Tue Nov 10 15:51:13 2015 +0300
Committer: sboikov 
Committed: Tue Nov 10 15:51:13 2015 +0300

--
 .../testsuites/IgniteClientNodesTestSuite.java  |  3 --
 .../ignite/testsuites/IgniteSpiTestSuite.java   | 33 ++--
 2 files changed, 31 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e7723fe1/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
index d54b890..c9405fa 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
@@ -21,7 +21,6 @@ import junit.framework.TestSuite;
 import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodeConcurrentStart;
 import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientReconnectTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheManyClientsTest;
-import 
org.apache.ignite.spi.discovery.tcp.IgniteClientReconnectMassiveShutdownTest;
 
 /**
  *
@@ -34,8 +33,6 @@ public class IgniteClientNodesTestSuite extends TestSuite {
 public static TestSuite suite() throws Exception {
 TestSuite suite = new TestSuite("Ignite Client Nodes Reconnect Test 
Suite");
 
-suite.addTestSuite(IgniteClientReconnectMassiveShutdownTest.class);
-
 suite.addTest(IgniteClientReconnectTestSuite.suite());
 
 suite.addTestSuite(IgniteCacheManyClientsTest.class);

http://git-wip-us.apache.org/repos/asf/ignite/blob/e7723fe1/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
index fb05d01..fc4023a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
@@ -19,7 +19,6 @@ package org.apache.ignite.testsuites;
 
 import junit.framework.TestSuite;
 import org.apache.ignite.internal.managers.GridNoopManagerSelfTest;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryMultiThreadedTest;
 
 /**
  * Grid SPI test suite.
@@ -32,8 +31,38 @@ public class IgniteSpiTestSuite extends TestSuite {
 public static TestSuite suite() throws Exception {
 TestSuite suite = new TestSuite("Ignite SPIs Test Suite");
 
+// Failover.
+suite.addTest(IgniteSpiFailoverSelfTestSuite.suite());
+
+// Collision.
+suite.addTest(IgniteSpiCollisionSelfTestSuite.suite());
+
+// Event storage.
+suite.addTest(IgniteSpiEventStorageSelfTestSuite.suite());
+
+// Load Balancing.
+suite.addTest(IgniteSpiLoadBalancingSelfTestSuite.suite());
+
+// Swap space.
+suite.addTest(IgniteSpiSwapSpaceSelfTestSuite.suite());
+
+// Checkpoints.
+suite.addTest(IgniteSpiCheckpointSelfTestSuite.suite());
+
+// Deployment
+suite.addTest(IgniteSpiDeploymentSelfTestSuite.suite());
+
+// Discovery.
+suite.addTest(IgniteSpiDiscoverySelfTestSuite.suite());
+
+// Communication.
+suite.addTest(IgniteSpiCommunicationSelfTestSuite.suite());
+
+// Indexing.
+suite.addTest(IgniteSpiIndexingSelfTestSuite.suite());
+
 // All other tests.
-suite.addTestSuite(TcpDiscoveryMultiThreadedTest.class);
+suite.addTestSuite(GridNoopManagerSelfTest.class);
 
 return suite;
 }

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-961

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5'

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5'

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5'

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-sql-opt

[50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1758-debug

7 matches

Site Navigation

Mail list logo

Footer information