ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [7/7] ignite git commit: Merge branch 'master' into ignite-2.0
Date Wed, 08 Feb 2017 10:42:42 GMT
Merge branch 'master' into ignite-2.0


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

Branch: refs/heads/ignite-2.0
Commit: 68ef21157c099f84b64f78237c86d97149d87037
Parents: af98efd bb1ac0a
Author: devozerov <vozerov@gridgain.com>
Authored: Wed Feb 8 13:42:08 2017 +0300
Committer: devozerov <vozerov@gridgain.com>
Committed: Wed Feb 8 13:42:08 2017 +0300

----------------------------------------------------------------------
 .../apache/ignite/IgniteSystemProperties.java   |   3 +
 .../processors/cache/GridCacheProcessor.java    |  85 +++++++
 .../distributed/dht/GridDhtCacheAdapter.java    |  10 +-
 .../distributed/dht/GridDhtLocalPartition.java  | 120 ++++++++--
 .../cache/CacheDeferredDeleteQueueTest.java     | 134 +++++++++++
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 .../Apache.Ignite.Examples.csproj               |   1 +
 .../Datagrid/TransactionExample.cs              |  75 ++++--
 modules/web-console/backend/app/agent.js        |  10 +-
 modules/web-console/backend/app/mongo.js        |  49 ++--
 modules/web-console/backend/app/routes.js       |   5 +-
 .../web-console/backend/routes/activities.js    |  52 +++++
 modules/web-console/backend/routes/admin.js     |   2 +-
 modules/web-console/backend/routes/agent.js     |  10 +-
 modules/web-console/backend/routes/public.js    |   1 -
 .../web-console/backend/services/activities.js  | 136 +++++++++++
 modules/web-console/backend/services/users.js   |  13 +-
 modules/web-console/frontend/app/app.config.js  |   9 +
 modules/web-console/frontend/app/app.js         |  29 ++-
 .../activities-user-dialog.controller.js        |  60 +++++
 .../activities-user-dialog.jade                 |  36 +++
 .../components/activities-user-dialog/index.js  |  36 +++
 .../form-field-datepicker.jade                  |  55 +++++
 .../form-field-datepicker.scss                  |  20 ++
 .../list-of-registered-users/index.js           |  28 +++
 .../list-of-registered-users.categories.js      |  30 +++
 .../list-of-registered-users.column-defs.js     |  80 +++++++
 .../list-of-registered-users.controller.js      | 207 ++++++++++++++++
 .../list-of-registered-users.jade               |  54 +++++
 .../ui-grid-header/ui-grid-header.jade          |  27 +++
 .../ui-grid-header/ui-grid-header.scss          |  84 +++++++
 .../ui-grid-settings/ui-grid-settings.jade      |  33 +++
 .../ui-grid-settings/ui-grid-settings.scss      |  70 ++++++
 .../app/core/activities/Activities.data.js      |  39 ++++
 .../frontend/app/core/admin/Admin.data.js       |  77 ++++++
 modules/web-console/frontend/app/core/index.js  |  25 ++
 modules/web-console/frontend/app/data/i18n.js   |  38 +++
 .../ui-grid-settings/ui-grid-settings.jade      |  33 ---
 .../ui-grid-settings/ui-grid-settings.scss      |  38 ---
 .../app/filters/uiGridSubcategories.filter.js   |  24 ++
 .../frontend/app/modules/Demo/Demo.module.js    | 166 -------------
 .../frontend/app/modules/demo/Demo.module.js    | 172 ++++++++++++++
 .../frontend/app/modules/sql/sql.controller.js  |  14 +-
 .../frontend/app/modules/sql/sql.module.js      |   2 +-
 .../frontend/app/modules/states/admin.state.js  |   2 +-
 .../configuration/summary/summary.controller.js |   6 +-
 .../app/modules/user/AclRoute.provider.js       |  31 +--
 .../frontend/app/modules/user/Auth.service.js   |   2 +-
 .../frontend/app/modules/user/permissions.js    |   2 +-
 .../frontend/app/modules/user/user.module.js    |   6 +-
 modules/web-console/frontend/app/vendor.js      |   1 +
 .../frontend/controllers/admin-controller.js    | 234 -------------------
 .../frontend/controllers/domains-controller.js  |  12 +-
 modules/web-console/frontend/package.json       |   1 +
 .../stylesheets/_font-awesome-custom.scss       |  28 +++
 .../frontend/public/stylesheets/style.scss      |  39 +++-
 .../frontend/public/stylesheets/variables.scss  |   1 +
 .../frontend/views/settings/admin.jade          |  32 +--
 modules/web-console/frontend/views/sql/sql.jade |   4 +-
 59 files changed, 1984 insertions(+), 611 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/68ef2115/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 42f44cf,87f5236..a204e01
--- 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
@@@ -118,11 -121,9 +121,12 @@@ import org.apache.ignite.lifecycle.Life
  import org.apache.ignite.marshaller.Marshaller;
  import org.apache.ignite.marshaller.MarshallerUtils;
  import org.apache.ignite.spi.IgniteNodeValidationResult;
 +import org.apache.ignite.spi.discovery.DiscoveryDataBag;
 +import org.apache.ignite.spi.discovery.DiscoveryDataBag.GridDiscoveryData;
 +import org.apache.ignite.spi.discovery.DiscoveryDataBag.JoiningNodeDiscoveryData;
  import org.jetbrains.annotations.Nullable;
  
+ import static org.apache.ignite.IgniteSystemProperties.IGNITE_CACHE_REMOVED_ENTRIES_TTL;
  import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
  import static org.apache.ignite.IgniteSystemProperties.getBoolean;
  import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@@ -844,7 -848,19 +848,18 @@@ public class GridCacheProcessor extend
              }
          }
  
 -        assert caches.containsKey(CU.MARSH_CACHE_NAME) : "Marshaller cache should be started";
          assert ctx.config().isDaemon() || caches.containsKey(CU.UTILITY_CACHE_NAME) : "Utility
cache should be started";
+ 
+         if (!ctx.clientNode() && !ctx.isDaemon())
+             addRemovedItemsCleanupTask(Long.getLong(IGNITE_CACHE_REMOVED_ENTRIES_TTL, 10_000));
+ 
+     }
+ 
+     /**
+      * @param timeout Cleanup timeout.
+      */
+     private void addRemovedItemsCleanupTask(long timeout) {
+         ctx.timeout().addTimeoutObject(new RemovedItemsCleanupTask(timeout));
      }
  
      /** {@inheritDoc} */


Mime
View raw message