ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [18/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-103
Date Thu, 05 Feb 2015 16:30:25 GMT
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-103


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

Branch: refs/heads/ignite-164v2
Commit: a8498d62f05ee94c62acf7370f8952af9e3f0122
Parents: 4299661 082bd57
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Feb 5 12:03:39 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Feb 5 12:03:39 2015 +0300

----------------------------------------------------------------------
 .gitignore                                      |     1 +
 config/hadoop/default-config.xml                |     2 +-
 .../src/test/resources/spring-server-node.xml   |     6 +-
 .../test/resources/spring-server-ssl-node.xml   |     6 +-
 .../src/main/java/org/apache/ignite/Ignite.java |    14 +-
 .../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 +
 .../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 -
 .../org/apache/ignite/internal/IgniteEx.java    |     8 +
 .../apache/ignite/internal/IgniteKernal.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 +-
 .../internal/util/future/IgniteFutureImpl.java  |     9 +-
 .../org/apache/ignite/lang/IgniteFuture.java    |    18 +-
 .../core/src/test/config/store/jdbc/Ignite.xml  |   101 +
 ...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 +
 .../util/future/IgniteFutureImplTest.java       |     3 +-
 .../ignite/testframework/junits/IgniteMock.java |     8 +-
 .../client/hadoop/GridHadoopClientProtocol.java |     1 -
 .../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 |     6 +-
 .../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 -
 .../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     |    12 +-
 .../config/benchmark-multicast.properties       |    74 +
 .../yardstick/config/benchmark-store.properties |    69 +
 modules/yardstick/config/benchmark.properties   |    70 +-
 .../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 +
 253 files changed, 60093 insertions(+), 47931 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a8498d62/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a8498d62/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a8498d62/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
----------------------------------------------------------------------


Mime
View raw message