Merge branch 'sprint-1' into ignite-128
Conflicts:
modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0c424bbc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c424bbc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c424bbc
Branch: refs/heads/ignite-82
Commit: 0c424bbcb7a99d60bd936fc9a5a1d9b09328180b
Parents: 3bccc23 a577f74
Author: vozerov-gridgain <[email protected]>
Authored: Thu Feb 5 10:18:54 2015 +0300
Committer: vozerov-gridgain <[email protected]>
Committed: Thu Feb 5 10:18:54 2015 +0300
----------------------------------------------------------------------
config/hadoop/default-config.xml | 2 +-
docs/core-site.ignite.xml | 2 +-
examples/config/example-cache.xml | 14 +-
examples/config/example-compute.xml | 8 +-
examples/config/example-streamer.xml | 30 +-
examples/config/filesystem/core-site.xml | 10 +-
examples/config/filesystem/example-ggfs.xml | 165 -
examples/config/filesystem/example-ignitefs.xml | 165 +
examples/config/filesystem/readme.txt | 8 +-
.../hibernate/example-hibernate-L2-cache.xml | 6 +-
examples/config/servlet/WEB-INF/web.xml | 2 +-
examples/rest/http-rest-example.php | 8 +-
examples/rest/memcache-rest-example.php | 4 +-
.../ignite/examples/ComputeNodeStartup.java | 4 +-
.../apache/ignite/examples/ExamplesUtils.java | 6 +-
.../compute/ComputeBroadcastExample.java | 34 +-
.../compute/ComputeCallableExample.java | 18 +-
.../examples/compute/ComputeClosureExample.java | 20 +-
.../compute/ComputeContinuousMapperExample.java | 24 +-
.../compute/ComputeExecutorServiceExample.java | 16 +-
.../ComputeFibonacciContinuationExample.java | 35 +-
.../compute/ComputeProjectionExample.java | 23 +-
.../examples/compute/ComputeReducerExample.java | 20 +-
.../compute/ComputeRunnableExample.java | 17 +-
.../compute/ComputeScheduleExample.java | 14 +-
.../examples/compute/ComputeTaskMapExample.java | 30 +-
.../compute/ComputeTaskSplitExample.java | 26 +-
.../failover/ComputeFailoverExample.java | 17 +-
.../failover/ComputeFailoverNodeStartup.java | 12 +-
.../compute/montecarlo/CreditRiskExample.java | 30 +-
.../compute/montecarlo/CreditRiskManager.java | 14 +-
.../apache/ignite/examples/compute/package.html | 2 +-
.../examples/datagrid/CacheAffinityExample.java | 37 +-
.../examples/datagrid/CacheApiExample.java | 104 +-
.../datagrid/CacheContinuousQueryExample.java | 10 +-
.../datagrid/CacheDataLoaderExample.java | 16 +-
.../examples/datagrid/CacheEventsExample.java | 21 +-
.../examples/datagrid/CacheNodeStartup.java | 4 +-
.../datagrid/CachePopularNumbersExample.java | 32 +-
.../examples/datagrid/CachePutGetExample.java | 29 +-
.../examples/datagrid/CacheQueryExample.java | 26 +-
.../datagrid/CacheTransactionExample.java | 41 +-
.../datastructures/CacheAtomicLongExample.java | 16 +-
.../CacheAtomicReferenceExample.java | 24 +-
.../CacheAtomicSequenceExample.java | 14 +-
.../CacheAtomicStampedExample.java | 22 +-
.../CacheCountDownLatchExample.java | 16 +-
.../datastructures/CacheQueueExample.java | 46 +-
.../datastructures/CacheSetExample.java | 36 +-
.../hibernate/HibernateL2CacheExample.java | 18 +-
.../HibernateL2CacheExampleNodeStartup.java | 12 +-
.../ignite/examples/datagrid/package.html | 2 +-
.../starschema/CacheStarSchemaExample.java | 57 +-
.../datagrid/starschema/DimProduct.java | 3 +-
.../examples/datagrid/starschema/DimStore.java | 3 +-
.../datagrid/starschema/FactPurchase.java | 3 +-
.../examples/datagrid/starschema/package.html | 2 +-
.../store/CacheNodeWithStoreStartup.java | 12 +-
.../datagrid/store/CacheStoreExample.java | 17 +-
.../store/CacheStoreLoadDataExample.java | 15 +-
.../store/dummy/CacheDummyPersonStore.java | 9 +-
.../datagrid/store/hibernate/hibernate.cfg.xml | 2 +-
.../store/jdbc/CacheJdbcPersonStore.java | 10 +-
.../ignite/examples/events/EventsExample.java | 32 +-
.../ignite/examples/fs/IgniteFsExample.java | 278 +
.../examples/fs/IgniteFsMapReduceExample.java | 249 +
.../ignite/examples/fs/IgniteFsNodeStartup.java | 41 +
.../org/apache/ignite/examples/fs/package.html | 23 +
.../ignite/examples/ggfs/GgfsExample.java | 278 -
.../examples/ggfs/GgfsMapReduceExample.java | 249 -
.../ignite/examples/ggfs/GgfsNodeStartup.java | 41 -
.../apache/ignite/examples/ggfs/package.html | 23 -
.../examples/messaging/MessagingExample.java | 36 +-
.../messaging/MessagingPingPongExample.java | 26 +-
.../MessagingPingPongListenActorExample.java | 20 +-
.../client/memcache/MemcacheRestExample.java | 22 +-
.../MemcacheRestExampleNodeStartup.java | 14 +-
.../misc/deployment/DeploymentExample.java | 34 +-
.../misc/lifecycle/LifecycleExample.java | 24 +-
.../misc/springbean/SpringBeanExample.java | 30 +-
.../examples/misc/springbean/package.html | 2 +-
.../examples/misc/springbean/spring-bean.xml | 8 +-
.../org/apache/ignite/examples/package.html | 2 +-
.../examples/services/ServicesExample.java | 16 +-
.../streaming/StreamingCheckInExample.java | 30 +-
.../streaming/StreamingNodeStartup.java | 4 +-
.../StreamingPopularNumbersExample.java | 40 +-
.../streaming/StreamingPriceBarsExample.java | 38 +-
.../StreamingRunningAverageExample.java | 6 +-
.../apache/ignite/examples/ComputeExample.java | 22 +-
.../ignite/examples/MessagingExample.java | 66 +-
.../examples/ScalarCacheAffinityExample1.scala | 22 +-
.../examples/ScalarCacheAffinityExample2.scala | 18 +-
.../ScalarCacheAffinitySimpleExample.scala | 6 +-
.../scalar/examples/ScalarCacheExample.scala | 4 +-
.../ScalarCachePopularNumbersExample.scala | 26 +-
.../examples/ScalarCacheQueryExample.scala | 20 +-
.../scalar/examples/ScalarClosureExample.scala | 20 +-
.../examples/ScalarContinuationExample.scala | 33 +-
.../examples/ScalarCreditRiskExample.scala | 22 +-
.../scalar/examples/ScalarJvmCloudExample.scala | 22 +-
.../examples/ScalarPiCalculationExample.scala | 6 +-
.../scalar/examples/ScalarPingPongExample.scala | 14 +-
.../scalar/examples/ScalarPrimeExample.scala | 16 +-
.../scalar/examples/ScalarScheduleExample.scala | 6 +-
.../examples/ScalarSnowflakeSchemaExample.scala | 40 +-
.../scalar/examples/ScalarTaskExample.scala | 14 +-
.../examples/ScalarWorldShortestMapReduce.scala | 2 +-
.../BasicExamplesMultiNodeSelfTest.java | 28 +
.../ignite/examples/BasicExamplesSelfTest.java | 82 +
.../CacheExamplesMultiNodeSelfTest.java | 48 +
.../ignite/examples/CacheExamplesSelfTest.java | 155 +
...heStoreLoadDataExampleMultiNodeSelfTest.java | 39 +
.../examples/CheckpointExamplesSelfTest.java | 45 +
.../ContinuationExamplesMultiNodeSelfTest.java | 28 +
.../examples/ContinuationExamplesSelfTest.java | 33 +
...ntinuousMapperExamplesMultiNodeSelfTest.java | 28 +
.../ContinuousMapperExamplesSelfTest.java | 33 +
.../DeploymentExamplesMultiNodeSelfTest.java | 30 +
.../examples/DeploymentExamplesSelfTest.java | 33 +
.../EventsExamplesMultiNodeSelfTest.java | 28 +
.../ignite/examples/EventsExamplesSelfTest.java | 33 +
.../GridBasicExamplesMultiNodeSelfTest.java | 28 -
.../examples/GridBasicExamplesSelfTest.java | 82 -
.../GridCacheExamplesMultiNodeSelfTest.java | 48 -
.../examples/GridCacheExamplesSelfTest.java | 155 -
...heStoreLoadDataExampleMultiNodeSelfTest.java | 39 -
.../GridCheckpointExamplesSelfTest.java | 45 -
...idContinuationExamplesMultiNodeSelfTest.java | 28 -
.../GridContinuationExamplesSelfTest.java | 33 -
...ntinuousMapperExamplesMultiNodeSelfTest.java | 28 -
.../GridContinuousMapperExamplesSelfTest.java | 33 -
...GridDeploymentExamplesMultiNodeSelfTest.java | 30 -
.../GridDeploymentExamplesSelfTest.java | 33 -
.../GridEventsExamplesMultiNodeSelfTest.java | 28 -
.../examples/GridEventsExamplesSelfTest.java | 33 -
...ibernateL2CacheExampleMultiNodeSelfTest.java | 31 -
.../GridHibernateL2CacheExampleSelfTest.java | 33 -
.../examples/GridLifecycleExamplesSelfTest.java | 33 -
...idMemcacheRestExamplesMultiNodeSelfTest.java | 31 -
.../GridMemcacheRestExamplesSelfTest.java | 41 -
.../examples/GridMessagingExamplesSelfTest.java | 52 -
...GridMonteCarloExamplesMultiNodeSelfTest.java | 28 -
.../GridMonteCarloExamplesSelfTest.java | 74 -
.../examples/GridProjectionExampleSelfTest.java | 39 -
.../GridSpringBeanExamplesSelfTest.java | 33 -
.../GridTaskExamplesMultiNodeSelfTest.java | 28 -
.../examples/GridTaskExamplesSelfTest.java | 40 -
...ibernateL2CacheExampleMultiNodeSelfTest.java | 31 +
.../HibernateL2CacheExampleSelfTest.java | 33 +
.../examples/IgniteFsExamplesSelfTest.java | 16 +-
.../examples/LifecycleExamplesSelfTest.java | 33 +
.../MemcacheRestExamplesMultiNodeSelfTest.java | 31 +
.../examples/MemcacheRestExamplesSelfTest.java | 41 +
.../examples/MessagingExamplesSelfTest.java | 52 +
.../MonteCarloExamplesMultiNodeSelfTest.java | 28 +
.../examples/MonteCarloExamplesSelfTest.java | 74 +
.../examples/ProjectionExampleSelfTest.java | 39 +
.../examples/SpringBeanExamplesSelfTest.java | 33 +
.../examples/TaskExamplesMultiNodeSelfTest.java | 28 +
.../ignite/examples/TaskExamplesSelfTest.java | 40 +
.../testsuites/IgniteExamplesSelfTestSuite.java | 54 +-
.../ScalarExamplesSelfTestSuite.scala | 7 +-
.../client/ClientDefaultCacheSelfTest.java | 70 +-
.../src/test/resources/spring-server-node.xml | 6 +-
.../test/resources/spring-server-ssl-node.xml | 6 +-
.../src/main/java/org/apache/ignite/Ignite.java | 18 +-
.../apache/ignite/IgniteCheckedException.java | 24 -
.../java/org/apache/ignite/IgniteException.java | 26 +-
.../java/org/apache/ignite/IgnitePortables.java | 4 +-
.../apache/ignite/cache/CacheConfiguration.java | 23 +
.../ignite/cache/CacheTypeFieldMetadata.java | 145 +
.../apache/ignite/cache/CacheTypeMetadata.java | 330 +
.../ignite/cache/GridCacheVersionedEntry.java | 3 +-
.../cache/query/CacheQueryConfiguration.java | 23 -
.../cache/query/CacheQueryTypeMetadata.java | 196 -
.../apache/ignite/cache/store/CacheStore.java | 2 +-
.../ignite/cache/store/jdbc/JdbcCacheStore.java | 1560 ++
.../cache/store/jdbc/JdbcPojoCacheStore.java | 205 +
.../store/jdbc/dialect/BasicJdbcDialect.java | 274 +
.../cache/store/jdbc/dialect/DB2Dialect.java | 68 +
.../cache/store/jdbc/dialect/H2Dialect.java | 41 +
.../cache/store/jdbc/dialect/JdbcDialect.java | 117 +
.../cache/store/jdbc/dialect/MySQLDialect.java | 48 +
.../cache/store/jdbc/dialect/OracleDialect.java | 72 +
.../store/jdbc/dialect/SQLServerDialect.java | 67 +
.../cache/store/jdbc/dialect/package.html | 24 +
.../org/apache/ignite/cluster/ClusterGroup.java | 9 +-
.../configuration/IgniteConfiguration.java | 9 +-
.../org/apache/ignite/hadoop/GridHadoop.java | 86 -
.../ignite/hadoop/GridHadoopConfiguration.java | 172 -
.../apache/ignite/hadoop/GridHadoopCounter.java | 44 -
.../ignite/hadoop/GridHadoopCounterWriter.java | 36 -
.../ignite/hadoop/GridHadoopCounters.java | 49 -
.../ignite/hadoop/GridHadoopFileBlock.java | 162 -
.../ignite/hadoop/GridHadoopInputSplit.java | 54 -
.../org/apache/ignite/hadoop/GridHadoopJob.java | 102 -
.../apache/ignite/hadoop/GridHadoopJobId.java | 102 -
.../apache/ignite/hadoop/GridHadoopJobInfo.java | 83 -
.../ignite/hadoop/GridHadoopJobPhase.java | 38 -
.../ignite/hadoop/GridHadoopJobProperty.java | 138 -
.../ignite/hadoop/GridHadoopJobStatus.java | 207 -
.../ignite/hadoop/GridHadoopMapReducePlan.java | 80 -
.../hadoop/GridHadoopMapReducePlanner.java | 40 -
.../ignite/hadoop/GridHadoopPartitioner.java | 33 -
.../ignite/hadoop/GridHadoopSerialization.java | 54 -
.../apache/ignite/hadoop/GridHadoopTask.java | 72 -
.../ignite/hadoop/GridHadoopTaskContext.java | 189 -
.../ignite/hadoop/GridHadoopTaskInfo.java | 153 -
.../ignite/hadoop/GridHadoopTaskInput.java | 55 -
.../ignite/hadoop/GridHadoopTaskOutput.java | 40 -
.../ignite/hadoop/GridHadoopTaskType.java | 56 -
.../java/org/apache/ignite/hadoop/package.html | 24 -
.../ignite/internal/ClusterGroupAdapter.java | 51 +-
.../ignite/internal/IgniteClusterAsyncImpl.java | 12 +-
.../org/apache/ignite/internal/IgniteEx.java | 8 +
.../apache/ignite/internal/IgniteKernal.java | 9 +-
.../processors/cache/GridCacheMapEntry.java | 6 +-
.../processors/cache/IgniteCacheProxy.java | 7 +
.../cache/query/GridCacheQueriesProxy.java | 2 +-
.../internal/processors/hadoop/GridHadoop.java | 86 +
.../hadoop/GridHadoopConfiguration.java | 172 +
.../processors/hadoop/GridHadoopCounter.java | 44 +
.../hadoop/GridHadoopCounterWriter.java | 36 +
.../processors/hadoop/GridHadoopCounters.java | 49 +
.../processors/hadoop/GridHadoopFileBlock.java | 162 +
.../processors/hadoop/GridHadoopInputSplit.java | 54 +
.../processors/hadoop/GridHadoopJob.java | 102 +
.../processors/hadoop/GridHadoopJobId.java | 102 +
.../processors/hadoop/GridHadoopJobInfo.java | 83 +
.../processors/hadoop/GridHadoopJobPhase.java | 38 +
.../hadoop/GridHadoopJobProperty.java | 138 +
.../processors/hadoop/GridHadoopJobStatus.java | 207 +
.../hadoop/GridHadoopMapReducePlan.java | 80 +
.../hadoop/GridHadoopMapReducePlanner.java | 40 +
.../hadoop/GridHadoopPartitioner.java | 33 +
.../hadoop/GridHadoopSerialization.java | 54 +
.../processors/hadoop/GridHadoopTask.java | 72 +
.../hadoop/GridHadoopTaskContext.java | 189 +
.../processors/hadoop/GridHadoopTaskInfo.java | 153 +
.../processors/hadoop/GridHadoopTaskInput.java | 55 +
.../processors/hadoop/GridHadoopTaskOutput.java | 40 +
.../processors/hadoop/GridHadoopTaskType.java | 56 +
.../hadoop/IgniteHadoopNoopProcessor.java | 1 -
.../hadoop/IgniteHadoopProcessorAdapter.java | 1 -
.../internal/processors/hadoop/package.html | 24 +
.../processors/query/GridQueryProcessor.java | 36 +-
.../ignite/internal/util/IgniteUtils.java | 22 -
.../internal/util/future/IgniteFutureImpl.java | 9 +-
.../apache/ignite/internal/util/typedef/X.java | 36 -
.../org/apache/ignite/lang/IgniteFuture.java | 18 +-
.../test/config/load/mongo-multinode-foster.xml | 170 -
.../core/src/test/config/store/jdbc/Ignite.xml | 101 +
.../IgniteExceptionHelpLinksSelfTest.java | 105 -
...ractJdbcCacheStoreMultithreadedSelfTest.java | 196 +
.../PojoJdbcCacheStoreMultitreadedSelfTest.java | 34 +
.../store/jdbc/PojoJdbcCacheStoreTest.java | 702 +
.../cache/store/jdbc/model/Organization.java | 155 +
.../cache/store/jdbc/model/OrganizationKey.java | 97 +
.../ignite/cache/store/jdbc/model/Person.java | 155 +
.../cache/store/jdbc/model/PersonKey.java | 97 +
.../ignite/cache/store/jdbc/model/package.html | 24 +
.../GridProjectionForCachesSelfTest.java | 27 +-
.../fs/GridGgfsCommonAbstractTest.java | 4 +-
.../util/future/IgniteFutureImplTest.java | 3 +-
.../ipc/shmem/GgfsSharedMemoryTestServer.java | 2 +-
.../IpcSharedMemoryCrashDetectionSelfTest.java | 2 +-
.../IpcSharedMemoryBenchmarkReader.java | 2 +-
.../ignite/p2p/GridP2PUndeploySelfTest.java | 2 +-
.../GridAbstractCommunicationSelfTest.java | 6 +-
...mmunicationSpiConcurrentConnectSelfTest.java | 6 +-
.../tcp/GridTcpCommunicationSpiLanTest.java | 6 +-
...cpCommunicationSpiMultithreadedSelfTest.java | 6 +-
...dTcpCommunicationSpiRecoveryAckSelfTest.java | 6 +-
...GridTcpCommunicationSpiRecoverySelfTest.java | 6 +-
.../GridAbstractDiscoverySelfTest.java | 12 +-
.../testframework/junits/GridAbstractTest.java | 10 +-
.../testframework/junits/GridTestIgnite.java | 230 -
.../testframework/junits/GridTestResources.java | 255 -
.../ignite/testframework/junits/IgniteMock.java | 224 +
.../junits/IgniteTestResources.java | 255 +
.../junits/spi/GridSpiAbstractTest.java | 6 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 1 -
.../client/hadoop/GridHadoopClientProtocol.java | 2 +-
.../counter/GridHadoopClientCounters.java | 2 +-
.../ignite/hadoop/GridHadoopDefaultJobInfo.java | 163 -
.../apache/ignite/hadoop/GridHadoopSetup.java | 506 -
.../processors/hadoop/GridHadoopContext.java | 1 -
.../hadoop/GridHadoopDefaultJobInfo.java | 162 +
.../processors/hadoop/GridHadoopImpl.java | 1 -
.../processors/hadoop/GridHadoopSetup.java | 506 +
.../processors/hadoop/GridHadoopUtils.java | 1 -
.../hadoop/IgniteHadoopProcessor.java | 1 -
.../counter/GridHadoopCounterAdapter.java | 2 +-
.../hadoop/counter/GridHadoopCountersImpl.java | 2 +-
.../counter/GridHadoopFSCounterWriter.java | 2 +-
.../hadoop/counter/GridHadoopLongCounter.java | 2 +-
.../counter/GridHadoopPerformanceCounter.java | 2 +-
.../jobtracker/GridHadoopJobMetadata.java | 4 +-
.../hadoop/jobtracker/GridHadoopJobTracker.java | 5 +-
.../planner/GridHadoopDefaultMapReducePlan.java | 2 +-
.../GridHadoopDefaultMapReducePlanner.java | 2 +-
.../GridHadoopProtocolJobCountersTask.java | 2 +-
.../proto/GridHadoopProtocolJobStatusTask.java | 2 +-
.../proto/GridHadoopProtocolKillJobTask.java | 2 +-
.../proto/GridHadoopProtocolNextTaskIdTask.java | 2 +-
.../proto/GridHadoopProtocolSubmitJobTask.java | 4 +-
.../proto/GridHadoopProtocolTaskAdapter.java | 5 +-
.../hadoop/shuffle/GridHadoopShuffle.java | 1 -
.../hadoop/shuffle/GridHadoopShuffleAck.java | 2 +-
.../hadoop/shuffle/GridHadoopShuffleJob.java | 4 +-
.../shuffle/GridHadoopShuffleMessage.java | 2 +-
.../GridHadoopConcurrentHashMultimap.java | 2 +-
.../collections/GridHadoopHashMultimap.java | 2 +-
.../collections/GridHadoopHashMultimapBase.java | 2 +-
.../shuffle/collections/GridHadoopMultimap.java | 2 +-
.../collections/GridHadoopMultimapBase.java | 4 +-
.../shuffle/collections/GridHadoopSkipList.java | 2 +-
.../GridHadoopEmbeddedTaskExecutor.java | 2 +-
.../taskexecutor/GridHadoopExecutorService.java | 2 +-
.../taskexecutor/GridHadoopRunnableTask.java | 5 +-
.../GridHadoopTaskExecutorAdapter.java | 1 -
.../taskexecutor/GridHadoopTaskStatus.java | 2 +-
.../GridHadoopExternalTaskExecutor.java | 1 -
.../GridHadoopJobInfoUpdateRequest.java | 2 +-
.../GridHadoopPrepareForJobRequest.java | 2 +-
.../GridHadoopTaskExecutionRequest.java | 2 +-
.../external/GridHadoopTaskFinishedMessage.java | 2 +-
.../child/GridHadoopChildProcessRunner.java | 4 +-
.../hadoop/v1/GridHadoopV1CleanupTask.java | 2 +-
.../hadoop/v1/GridHadoopV1MapTask.java | 1 -
.../hadoop/v1/GridHadoopV1OutputCollector.java | 2 +-
.../hadoop/v1/GridHadoopV1Partitioner.java | 2 +-
.../hadoop/v1/GridHadoopV1ReduceTask.java | 1 -
.../hadoop/v1/GridHadoopV1Reporter.java | 2 +-
.../hadoop/v1/GridHadoopV1SetupTask.java | 2 +-
.../hadoop/v1/GridHadoopV1Splitter.java | 1 -
.../processors/hadoop/v1/GridHadoopV1Task.java | 1 -
.../hadoop/v2/GridHadoopExternalSplit.java | 2 +-
.../v2/GridHadoopSerializationWrapper.java | 2 +-
.../hadoop/v2/GridHadoopSplitWrapper.java | 2 +-
.../hadoop/v2/GridHadoopV2CleanupTask.java | 2 +-
.../hadoop/v2/GridHadoopV2Context.java | 1 -
.../processors/hadoop/v2/GridHadoopV2Job.java | 1 -
.../v2/GridHadoopV2JobResourceManager.java | 2 +-
.../hadoop/v2/GridHadoopV2MapTask.java | 2 +-
.../hadoop/v2/GridHadoopV2Partitioner.java | 2 +-
.../hadoop/v2/GridHadoopV2ReduceTask.java | 2 +-
.../hadoop/v2/GridHadoopV2SetupTask.java | 2 +-
.../hadoop/v2/GridHadoopV2Splitter.java | 1 -
.../processors/hadoop/v2/GridHadoopV2Task.java | 2 +-
.../hadoop/v2/GridHadoopV2TaskContext.java | 1 -
.../v2/GridHadoopWritableSerialization.java | 2 +-
...ridHadoopClientProtocolEmbeddedSelfTest.java | 2 +-
.../hadoop/GridHadoopPopularWordsTest.java | 294 -
.../ignite/hadoop/GridHadoopTestUtils.java | 102 -
.../ignite/hadoop/books/alice-in-wonderland.txt | 3735 -----
.../apache/ignite/hadoop/books/art-of-war.txt | 6982 ---------
.../ignite/hadoop/books/huckleberry-finn.txt | 11733 ---------------
.../ignite/hadoop/books/sherlock-holmes.txt | 13052 -----------------
.../apache/ignite/hadoop/books/tom-sawyer.txt | 8858 -----------
.../hadoop/GridHadoopAbstractSelfTest.java | 1 -
.../hadoop/GridHadoopCommandLineTest.java | 1 -
...idHadoopDefaultMapReducePlannerSelfTest.java | 12 +-
.../hadoop/GridHadoopGroupingTest.java | 1 -
.../hadoop/GridHadoopJobTrackerSelfTest.java | 1 -
.../GridHadoopMapReduceEmbeddedSelfTest.java | 1 -
.../hadoop/GridHadoopMapReduceTest.java | 1 -
.../hadoop/GridHadoopPopularWordsTest.java | 294 +
.../GridHadoopSerializationWrapperSelfTest.java | 1 -
.../hadoop/GridHadoopSortingExternalTest.java | 2 -
.../hadoop/GridHadoopSortingTest.java | 1 -
.../hadoop/GridHadoopTaskExecutionSelfTest.java | 2 +-
.../hadoop/GridHadoopTasksAllVersionsTest.java | 1 -
.../hadoop/GridHadoopTasksV1Test.java | 1 -
.../hadoop/GridHadoopTasksV2Test.java | 1 -
.../GridHadoopTestRoundRobinMrPlanner.java | 1 -
.../hadoop/GridHadoopTestTaskContext.java | 1 -
.../processors/hadoop/GridHadoopTestUtils.java | 102 +
.../hadoop/GridHadoopV2JobSelfTest.java | 1 -
.../hadoop/books/alice-in-wonderland.txt | 3735 +++++
.../processors/hadoop/books/art-of-war.txt | 6982 +++++++++
.../hadoop/books/huckleberry-finn.txt | 11733 +++++++++++++++
.../processors/hadoop/books/sherlock-holmes.txt | 13052 +++++++++++++++++
.../processors/hadoop/books/tom-sawyer.txt | 8858 +++++++++++
.../collections/GridHadoopAbstractMapTest.java | 2 +-
...ridHadoopConcurrentHashMultimapSelftest.java | 2 +-
.../collections/GridHadoopHashMapSelfTest.java | 2 +-
.../collections/GridHadoopSkipListSelfTest.java | 2 +-
...GridHadoopExternalTaskExecutionSelfTest.java | 1 -
.../http/jetty/GridJettyRestHandler.java | 17 +
.../scala/org/apache/ignite/scalar/scalar.scala | 14 +-
.../tests/ScalarAffinityRoutingSpec.scala | 12 +-
.../tests/ScalarCacheProjectionSpec.scala | 2 +-
.../ignite/scalar/tests/ScalarCacheSpec.scala | 2 +-
.../scalar/tests/ScalarProjectionSpec.scala | 36 +-
.../processors/schedule/ScheduleFutureImpl.java | 16 +-
modules/schema-load/pom.xml | 107 +
.../main/java/media/data_connection_48x48.png | Bin 0 -> 4443 bytes
.../src/main/java/media/error_48x48.png | Bin 0 -> 4349 bytes
.../src/main/java/media/ignite_128x128.png | Bin 0 -> 4917 bytes
.../src/main/java/media/ignite_16x16.png | Bin 0 -> 608 bytes
.../src/main/java/media/ignite_24x24.png | Bin 0 -> 930 bytes
.../src/main/java/media/ignite_32x32.png | Bin 0 -> 1203 bytes
.../src/main/java/media/ignite_48x48.png | Bin 0 -> 1868 bytes
.../src/main/java/media/ignite_64x64.png | Bin 0 -> 2453 bytes
.../src/main/java/media/information_48x48.png | Bin 0 -> 4102 bytes
.../src/main/java/media/question_48x48.png | Bin 0 -> 3857 bytes
.../src/main/java/media/sign_warning_48x48.png | Bin 0 -> 2988 bytes
.../schema-load/src/main/java/media/style.css | 95 +
.../src/main/java/media/text_tree_48x48.png | Bin 0 -> 2567 bytes
.../ignite/schema/generator/PojoGenerator.java | 415 +
.../ignite/schema/generator/XmlGenerator.java | 341 +
.../ignite/schema/model/PojoDescriptor.java | 508 +
.../apache/ignite/schema/model/PojoField.java | 421 +
.../schema/parser/DatabaseMetadataParser.java | 105 +
.../apache/ignite/schema/parser/DbColumn.java | 76 +
.../apache/ignite/schema/parser/DbTable.java | 105 +
.../parser/dialect/DB2MetadataDialect.java | 30 +
.../parser/dialect/DatabaseMetadataDialect.java | 78 +
.../parser/dialect/JdbcMetadataDialect.java | 144 +
.../parser/dialect/OracleMetadataDialect.java | 257 +
.../ignite/schema/ui/ConfirmCallable.java | 81 +
.../org/apache/ignite/schema/ui/Controls.java | 661 +
.../org/apache/ignite/schema/ui/GridPaneEx.java | 177 +
.../org/apache/ignite/schema/ui/MessageBox.java | 233 +
.../apache/ignite/schema/ui/ModalDialog.java | 50 +
.../apache/ignite/schema/ui/SchemaLoadApp.java | 1395 ++
.../ignite/schema/ui/TextColumnValidator.java | 32 +
.../schema/load/AbstractSchemaLoaderTest.java | 134 +
.../load/generator/PojoGeneratorTest.java | 70 +
.../schema/load/generator/XmlGeneratorTest.java | 50 +
.../apache/ignite/schema/load/model/Ignite.xml | 321 +
.../apache/ignite/schema/load/model/Objects.txt | 502 +
.../ignite/schema/load/model/ObjectsKey.txt | 96 +
.../ignite/schema/load/model/Primitives.txt | 506 +
.../ignite/schema/load/model/PrimitivesKey.txt | 96 +
.../load/parser/DbMetadataParserTest.java | 118 +
.../testsuites/IgniteSchemaLoadTestSuite.java | 41 +
.../org/apache/ignite/IgniteSpringBean.java | 14 +-
.../yardstick/config/benchmark-store.properties | 69 +
.../yardstick/config/ignite-store-config.xml | 203 +
.../ignite/yardstick/cache/model/SampleKey.java | 88 +
.../yardstick/cache/model/SampleValue.java | 9 +-
.../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 44 +
.../store/jdbc/IgniteJdbcStoreGetBenchmark.java | 53 +
.../store/jdbc/IgniteJdbcStorePutBenchmark.java | 42 +
.../jdbc/IgniteJdbcStorePutGetBenchmark.java | 47 +
pom.xml | 1 +
449 files changed, 63464 insertions(+), 51788 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c424bbc/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
----------------------------------------------------------------------
diff --cc
modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
index 8833e13,0000000..b2135e9
mode 100644,000000..100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
@@@ -1,156 -1,0 +1,222 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.client;
+
++import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
++import java.io.*;
++import java.net.*;
++import java.nio.charset.*;
+import java.util.*;
+
+import static org.apache.ignite.internal.client.GridClientProtocol.*;
+import static org.apache.ignite.IgniteSystemProperties.*;
+
+/**
+ * Tests that client is able to connect to a grid with only default cache
enabled.
+ */
+public class ClientDefaultCacheSelfTest extends GridCommonAbstractTest {
+ /** Path to jetty config configured with SSL. */
+ private static final String REST_JETTY_CFG =
"modules/clients/src/test/resources/jetty/rest-jetty.xml";
+
+ /** IP finder. */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new
TcpDiscoveryVmIpFinder(true);
+
+ /** Host. */
+ private static final String HOST = "127.0.0.1";
+
+ /** Port. */
+ private static final int TCP_PORT = 11211;
+
+ /** Cached local node id. */
+ private UUID locNodeId;
+
+ /** Http port. */
+ private static final int HTTP_PORT = 8081;
+
++ /** Url address to send HTTP request. */
++ private static final String TEST_URL = "http://"; + HOST + ":" + HTTP_PORT
+ "/gridgain";
++
++ /** Used to sent request charset. */
++ private static final String CHARSET = StandardCharsets.UTF_8.name();
++
++ /** Name of node local cache. */
++ private static final String LOCAL_CACHE = "local";
++
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ System.setProperty(IGNITE_JETTY_PORT, String.valueOf(HTTP_PORT));
+
+ startGrid();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopGrid();
+
- System.clearProperty (IGNITE_JETTY_PORT);
++ System.clearProperty(IGNITE_JETTY_PORT);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ locNodeId = grid().localNode().id();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ assert cfg.getClientConnectionConfiguration() == null;
+
+ ClientConnectionConfiguration clientCfg = new
ClientConnectionConfiguration();
+
+ clientCfg.setJettyPath(REST_JETTY_CFG);
+
+ cfg.setClientConnectionConfiguration(clientCfg);
+
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+ disco.setIpFinder(IP_FINDER);
+
+ cfg.setDiscoverySpi(disco);
+
- cfg.setCacheConfiguration(defaultCacheConfiguration());
++ CacheConfiguration cLocal = new CacheConfiguration();
++
++ cLocal.setName(LOCAL_CACHE);
++
++ cLocal.setCacheMode(CacheMode.LOCAL);
++
++ cLocal.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL);
++
++ cfg.setCacheConfiguration(defaultCacheConfiguration(), cLocal);
+
+ return cfg;
+ }
+
+ /**
+ * @return Client.
+ * @throws GridClientException In case of error.
+ */
+ private GridClient clientTcp() throws GridClientException {
+ GridClientConfiguration cfg = new GridClientConfiguration();
+
+ cfg.setProtocol(TCP);
+ cfg.setServers(getServerList(TCP_PORT));
+ cfg.setDataConfigurations(Collections.singleton(new
GridClientDataConfiguration()));
+
+ GridClient gridClient = GridClientFactory.start(cfg);
+
+ assert F.exist(gridClient.compute().nodes(), new
IgnitePredicate<GridClientNode>() {
+ @Override public boolean apply(GridClientNode n) {
+ return n.nodeId().equals(locNodeId);
+ }
+ });
+
+ return gridClient;
+ }
+
+ /**
+ * Builds list of connection strings with few different ports.
+ * Used to avoid possible failures in case of port range active.
+ *
+ * @param startPort Port to start list from.
+ * @return List of client connection strings.
+ */
+ private Collection<String> getServerList(int startPort) {
+ Collection<String> srvs = new ArrayList<>();
+
+ for (int i = startPort; i < startPort + 10; i++)
+ srvs.add(HOST + ":" + i);
+
+ return srvs;
+ }
+
++ /*
++ * Send HTTP request to Jetty server of node and process result.
++ *
++ * @param query Send query parameters.
++ * @return Processed response string.
++ */
++ private String sendHttp(String query) {
++ String res = "No result";
++
++ try {
++ URLConnection connection = new URL(TEST_URL + "?" +
query).openConnection();
++
++ connection.setRequestProperty("Accept-Charset", CHARSET);
++
++ BufferedReader r = new BufferedReader(new
InputStreamReader(connection.getInputStream()));
++
++ res = r.readLine();
++
++ r.close();
++ }
++ catch (IOException e) {
++ error("Failed to send HTTP request: " + TEST_URL + "?" + query,
e);
++ }
++
++ // Cut node id from response.
++ return res.substring(res.indexOf("\"response\""));
++ }
++
+ /**
+ * @throws Exception If failed.
+ */
+ public void testTcp() throws Exception {
+ try {
+ boolean putRes = cache().putx("key", 1);
+
+ assert putRes : "Put operation failed";
+
+ GridClient client = clientTcp();
+
+ Integer val = client.data().<String, Integer>get("key");
+
+ assert val != null;
+
+ assert val == 1;
+ }
+ finally {
+ GridClientFactory.stopAll();
+ }
+ }
++
++ /**
++ * Json format string in cache should not transform to Json object on get
request.
++ */
++ public void testSkipString2JsonTransformation() {
++ // Put to cache JSON format string value.
++ assertEquals("Incorrect query response",
"\"response\":true,\"sessionToken\":\"\",\"successStatus\":0}",
++ sendHttp("cmd=put&cacheName=" + LOCAL_CACHE +
++
"&key=a&val=%7B%22v%22%3A%22my%20Value%22%2C%22t%22%3A1422559650154%7D"));
++
++ // Escape '\' symbols disappear from response string on
transformation to JSON object.
++ assertEquals(
++ "Incorrect query response",
++ "\"response\":\"{\\\"v\\\":\\\"my
Value\\\",\\\"t\\\":1422559650154}\"," +
++ "\"sessionToken\":\"\",\"successStatus\":0}",
++ sendHttp("cmd=get&cacheName=" + LOCAL_CACHE + "&key=a"));
++ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c424bbc/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c424bbc/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c424bbc/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 4d71daf,295bf61..c4d9ae3
---
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@@ -19,9 -19,10 +19,9 @@@ package org.apache.ignite.configuration
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
-import org.apache.ignite.client.ssl.*;
import org.apache.ignite.events.*;
import org.apache.ignite.fs.*;
- import org.apache.ignite.hadoop.*;
+ import org.apache.ignite.internal.processors.hadoop.*;
import org.apache.ignite.internal.managers.eventstorage.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c424bbc/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c424bbc/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
----------------------------------------------------------------------
diff --cc
modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
index dc68c05,2b8dc10..3038794
---
a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
+++
b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
@@@ -31,9 -31,8 +31,9 @@@ import org.apache.hadoop.security.*
import org.apache.hadoop.security.authorize.*;
import org.apache.hadoop.security.token.*;
import org.apache.ignite.*;
-import org.apache.ignite.client.*;
++import org.apache.ignite.internal.client.*;
import org.apache.ignite.client.hadoop.counter.*;
+import org.apache.ignite.hadoop.*;
- import org.apache.ignite.internal.client.*;
import org.apache.ignite.internal.processors.hadoop.*;
import org.apache.ignite.internal.processors.hadoop.proto.*;
import org.apache.ignite.internal.util.typedef.internal.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c424bbc/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c424bbc/pom.xml
----------------------------------------------------------------------
