You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/07/12 06:49:23 UTC

[11/11] ignite git commit: Merge branch 'ignite-2.1'

Merge branch 'ignite-2.1'


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

Branch: refs/heads/master
Commit: 120384fca2b5f6f141207697f776d7859afa857f
Parents: b95f76f 478d3b5
Author: devozerov <vo...@gridgain.com>
Authored: Wed Jul 12 09:48:51 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed Jul 12 09:48:51 2017 +0300

----------------------------------------------------------------------
 .../examples/datagrid/CacheQueryDdlExample.java |   3 +-
 .../jdbc2/JdbcDefaultNoOpCacheTest.java         |  33 ++
 .../JettyRestProcessorAbstractSelfTest.java     |   2 +-
 .../ignite/jdbc/JdbcDefaultNoOpCacheTest.java   |  35 ++
 .../ignite/jdbc/JdbcNoDefaultCacheTest.java     |  50 +-
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |   5 +-
 .../processors/cache/GridCacheProcessor.java    |   4 +-
 .../processors/cache/IgniteCacheProxy.java      |   5 +-
 .../cluster/GridClusterStateProcessor.java      |   4 +
 .../processors/igfs/IgfsNoopProcessor.java      |  11 +
 .../internal/processors/igfs/IgfsProcessor.java |  12 +-
 .../processors/igfs/IgfsProcessorAdapter.java   |   3 +-
 .../processors/rest/GridRestProcessor.java      |  47 +-
 .../processors/task/GridTaskProcessor.java      |  18 +-
 .../visor/VisorCoordinatorNodeTask.java         |  39 ++
 .../resources/META-INF/classnames.properties    |  13 +-
 .../cache/GridCacheLuceneQueryIndexTest.java    | 466 -------------------
 .../GridCacheQueryIndexingDisabledSelfTest.java |  16 +-
 .../IgniteMarshallerCacheFSRestoreTest.java     |   2 +
 modules/indexing/pom.xml                        |  12 +
 .../query/h2/opt/GridLuceneDirectory.java       |  47 +-
 .../query/h2/opt/GridLuceneIndex.java           |  75 +--
 .../query/h2/opt/GridLuceneInputStream.java     |  94 ++--
 .../query/h2/opt/GridLuceneLockFactory.java     |  45 +-
 .../query/h2/opt/GridLuceneOutputStream.java    |  72 +--
 .../cache/GridCacheFullTextQuerySelfTest.java   | 367 +++++++++++++++
 .../IgniteCacheAbstractFieldsQuerySelfTest.java |  30 +-
 ...teCacheFullTextQueryNodeJoiningSelfTest.java |   4 +-
 ...niteCachePartitionedFieldsQuerySelfTest.java |  20 +-
 .../IgniteCacheQuerySelfTestSuite.java          |   7 +-
 .../Cache/Query/CacheQueriesTest.cs             |  41 +-
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |   2 +
 .../helpers/jade/form/form-field-checkbox.pug   |   2 +-
 .../helpers/jade/form/form-field-dropdown.pug   |   1 -
 .../frontend/app/helpers/jade/mixins.pug        |   1 +
 .../configuration/generator/Maven.service.js    |  10 +-
 .../frontend/app/primitives/dropdown/index.scss |   4 +
 .../app/primitives/form-field/index.scss        |  48 +-
 .../frontend/app/primitives/index.js            |   2 +
 .../frontend/app/primitives/radio/index.pug     |  41 ++
 .../frontend/app/primitives/radio/index.scss    |  78 ++++
 .../frontend/app/primitives/switch/index.pug    |  34 --
 .../frontend/app/primitives/switch/index.scss   |  87 ----
 .../frontend/app/primitives/switcher/index.scss |   2 +-
 .../frontend/app/primitives/tooltip/index.scss  |  25 +
 .../app/primitives/typography/index.scss        |   2 +-
 .../app/primitives/ui-grid-settings/index.scss  |  47 +-
 .../frontend/app/primitives/ui-grid/index.scss  |  13 +-
 .../frontend/app/services/Confirm.service.js    |   2 +-
 .../frontend/app/services/Messages.service.js   |   3 +
 .../ignite/console/demo/AgentClusterDemo.java   |  12 +
 .../demo/service/DemoCachesLoadService.java     |   1 +
 parent/pom.xml                                  |   4 +-
 53 files changed, 1096 insertions(+), 907 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/120384fc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------