You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2017/03/23 07:16:02 UTC
[27/51] [abbrv] ignite git commit: Merge branch 'master' into
ignite-2.0
Merge branch 'master' into ignite-2.0
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
# modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0b6b8383
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0b6b8383
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0b6b8383
Branch: refs/heads/ignite-4829
Commit: 0b6b83839086171e06a00d518159ede17cdda3d8
Parents: 99bb87a 92bce6e
Author: devozerov <vo...@gridgain.com>
Authored: Tue Mar 21 11:09:29 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Mar 21 11:09:29 2017 +0300
----------------------------------------------------------------------
.../cache/eviction/AbstractEvictionPolicy.java | 203 +++++++++++++++++++
.../ignite/cache/eviction/EvictionPolicy.java | 2 -
.../cache/eviction/fifo/FifoEvictionPolicy.java | 158 +--------------
.../cache/eviction/lru/LruEvictionPolicy.java | 159 ++-------------
.../eviction/random/RandomEvictionPolicy.java | 124 -----------
.../random/RandomEvictionPolicyMBean.java | 42 ----
.../eviction/sorted/SortedEvictionPolicy.java | 159 ++-------------
.../cache/GridCacheAffinityManager.java | 21 +-
.../cache/GridCacheManagerAdapter.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 1 +
.../internal/visor/util/VisorTaskUtils.java | 8 +-
.../resources/META-INF/classnames.properties | 1 -
...ridFailFastNodeFailureDetectionSelfTest.java | 2 +-
...idCacheConfigurationConsistencySelfTest.java | 6 +-
.../cache/eviction/EvictionAbstractTest.java | 4 +-
.../cache/IncorrectCacheTypeMetadataTest.java | 72 +++++++
.../cache/IncorrectQueryEntityTest.java | 75 +++++++
.../IgniteCacheQuerySelfTestSuite.java | 4 +
modules/web-console/backend/app/agent.js | 14 +-
modules/web-console/backend/app/browser.js | 8 +-
modules/web-console/frontend/app/app.js | 10 +-
.../app/components/input-dialog/index.js | 24 +++
.../input-dialog/input-dialog.controller.js | 35 ++++
.../input-dialog/input-dialog.service.js | 88 ++++++++
.../input-dialog/input-dialog.tpl.pug | 39 ++++
.../ui-grid-settings/ui-grid-settings.scss | 35 ++++
.../frontend/app/modules/agent/agent.module.js | 10 +-
.../frontend/app/modules/sql/sql.controller.js | 109 +++++++---
.../frontend/app/services/Clone.service.js | 66 ------
.../frontend/controllers/caches-controller.js | 10 +-
.../frontend/controllers/clusters-controller.js | 6 +-
.../frontend/controllers/domains-controller.js | 12 +-
.../frontend/controllers/igfs-controller.js | 10 +-
.../frontend/public/stylesheets/style.scss | 8 +-
.../web-console/frontend/views/sql/sql.tpl.pug | 48 +++--
.../frontend/views/templates/clone.tpl.pug | 39 ----
.../frontend/views/templates/message.tpl.pug | 4 +-
parent/pom.xml | 2 -
38 files changed, 813 insertions(+), 807 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b6b8383/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index a7d38a7,b016883..d383ce8
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@@ -101,7 -99,9 +101,8 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.processors.cache.version.GridCacheVersionManager;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor;
import org.apache.ignite.internal.processors.plugin.CachePluginManager;
-import org.apache.ignite.internal.processors.query.GridQueryProcessor;
import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
+ import org.apache.ignite.internal.suggestions.GridPerformanceSuggestions;
import org.apache.ignite.internal.util.F0;
import org.apache.ignite.internal.util.future.GridCompoundFuture;
import org.apache.ignite.internal.util.future.GridFinishedFuture;
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b6b8383/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b6b8383/modules/core/src/test/java/org/apache/ignite/internal/GridFailFastNodeFailureDetectionSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b6b8383/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b6b8383/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b6b8383/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
----------------------------------------------------------------------