You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/12/02 09:25:25 UTC
[19/19] ignite git commit: Merge remote-tracking branch
'remotes/community/ignite-1.7.4'
Merge remote-tracking branch 'remotes/community/ignite-1.7.4'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/31bc3bf6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/31bc3bf6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/31bc3bf6
Branch: refs/heads/master
Commit: 31bc3bf6ed84ef6ea2253d3fafb9716c5d1e91e0
Parents: 88c06ec 33dda46
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 2 12:19:04 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 2 12:19:04 2016 +0300
----------------------------------------------------------------------
.../rest/RestProcessorMultiStartSelfTest.java | 48 +-
.../apache/ignite/IgniteSystemProperties.java | 13 +
.../apache/ignite/internal/IgniteKernal.java | 12 +-
.../processors/cache/CacheLockCandidates.java | 42 ++
.../cache/CacheLockCandidatesList.java | 71 +++
.../processors/cache/GridCacheEntryEx.java | 3 +-
.../processors/cache/GridCacheMapEntry.java | 117 +++-
.../processors/cache/GridCacheMvcc.java | 376 ++++++++----
.../processors/cache/GridCacheMvccCallback.java | 4 +-
.../cache/GridCacheMvccCandidate.java | 80 ++-
.../processors/cache/GridCacheMvccManager.java | 19 +-
.../processors/cache/GridCacheProcessor.java | 10 +-
.../distributed/GridDistributedCacheEntry.java | 303 +++-------
.../distributed/dht/GridDhtCacheEntry.java | 32 +-
.../distributed/dht/GridDhtLockFuture.java | 34 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 1 -
.../distributed/dht/GridDhtTxPrepareFuture.java | 5 +-
...GridNearAtomicSingleUpdateInvokeRequest.java | 5 +-
.../colocated/GridDhtColocatedLockFuture.java | 8 +-
.../distributed/near/GridNearCacheEntry.java | 44 +-
.../distributed/near/GridNearLockFuture.java | 3 +-
.../near/GridNearTransactionalCache.java | 5 +-
.../cache/local/GridLocalCacheEntry.java | 173 ++----
.../cache/local/GridLocalLockFuture.java | 2 +-
.../cache/query/GridCacheQueryManager.java | 18 +-
.../cache/transactions/IgniteTxManager.java | 6 +-
.../processors/odbc/OdbcRequestHandler.java | 32 +-
.../processors/rest/GridRestProcessor.java | 15 +
.../apache/ignite/internal/util/GridUnsafe.java | 9 +-
.../ignite/marshaller/jdk/JdkMarshaller.java | 4 +-
.../optimized/OptimizedMarshaller.java | 8 +-
.../resources/META-INF/classnames.properties | 86 ++-
.../CacheSerializableTransactionsTest.java | 604 ++++++++++++++++++-
.../cache/GridCacheMvccFlagsTest.java | 8 +-
.../cache/GridCacheMvccPartitionedSelfTest.java | 334 ++++++++--
.../processors/cache/GridCacheMvccSelfTest.java | 212 +++----
.../processors/cache/GridCacheTestEntryEx.java | 77 +--
.../cache/OffheapCacheOnClientsTest.java | 143 +++++
.../loadtests/hashmap/GridHashMapLoadTest.java | 7 +-
.../testsuites/IgniteCacheTestSuite2.java | 2 +
.../resources/META-INF/classnames.properties | 114 ++++
.../src/impl/binary/binary_reader_impl.cpp | 3 +-
.../putget-example/src/putget_example.cpp | 2 +-
.../query-example/src/query_example.cpp | 2 +-
modules/platforms/cpp/odbc/src/connection.cpp | 21 +-
modules/web-console/backend/app/agent.js | 32 +-
modules/web-console/backend/app/browser.js | 13 +
modules/web-console/backend/app/mongo.js | 6 +
.../backend/config/settings.json.sample | 7 -
modules/web-console/backend/index.js | 6 +-
modules/web-console/backend/middlewares/host.js | 7 +-
modules/web-console/backend/routes/agent.js | 4 +-
modules/web-console/backend/services/agents.js | 2 +-
modules/web-console/backend/services/caches.js | 2 +
.../docker/compose/backend/.dockerignore | 2 +
.../docker/compose/backend/Dockerfile | 6 +-
.../web-console/docker/compose/backend/build.sh | 4 +-
.../docker/compose/docker-compose.yml | 5 -
.../docker/compose/frontend/DockerfileBuild | 4 +-
.../docker/compose/frontend/build.sh | 6 +-
.../compose/frontend/nginx/web-console.conf | 9 +
.../web-console/docker/standalone/.dockerignore | 5 +
.../web-console/docker/standalone/Dockerfile | 10 +-
modules/web-console/docker/standalone/build.sh | 4 +-
.../docker/standalone/docker-compose.yml | 7 +-
.../docker/standalone/nginx/web-console.conf | 9 +
.../frontend/app/data/pom-dependencies.json | 2 +-
.../directives/ui-ace-pojos/ui-ace-pojos.jade | 2 +-
.../frontend/app/filters/duration.filter.js | 3 +
.../helpers/jade/form/form-field-checkbox.jade | 2 +-
.../helpers/jade/form/form-field-datalist.jade | 2 +-
.../helpers/jade/form/form-field-dropdown.jade | 2 +-
.../helpers/jade/form/form-field-number.jade | 2 +-
.../helpers/jade/form/form-field-password.jade | 2 +-
.../app/helpers/jade/form/form-field-text.jade | 2 +-
.../frontend/app/helpers/jade/mixins.jade | 24 +-
.../modules/configuration/generator/Beans.js | 6 +
.../generator/ConfigurationGenerator.js | 165 ++---
.../generator/JavaTransformer.service.js | 15 +-
.../generator/Properties.service.js | 19 +
.../generator/SpringTransformer.service.js | 22 +-
.../generator/defaults/cache.provider.js | 8 +
.../generator/defaults/cluster.provider.js | 2 +-
.../app/modules/form/field/tooltip.directive.js | 2 +-
.../app/modules/form/group/tooltip.directive.js | 2 +-
.../app/modules/form/panel/field.directive.js | 4 +-
.../app/modules/sql/scan-filter-input.jade | 2 +-
.../frontend/app/modules/sql/sql.controller.js | 6 +-
.../configuration/caches/client-near-cache.jade | 2 +-
.../configuration/caches/concurrency.jade | 2 +-
.../states/configuration/caches/general.jade | 2 +-
.../states/configuration/caches/memory.jade | 2 +-
.../configuration/caches/near-cache-client.jade | 2 +-
.../configuration/caches/near-cache-server.jade | 2 +-
.../configuration/caches/node-filter.jade | 2 +-
.../states/configuration/caches/query.jade | 2 +-
.../states/configuration/caches/rebalance.jade | 2 +-
.../states/configuration/caches/statistics.jade | 2 +-
.../states/configuration/caches/store.jade | 20 +-
.../states/configuration/clusters/atomic.jade | 2 +-
.../configuration/clusters/attributes.jade | 2 +-
.../states/configuration/clusters/binary.jade | 2 +-
.../configuration/clusters/cache-key-cfg.jade | 2 +-
.../configuration/clusters/checkpoint.jade | 8 +-
.../configuration/clusters/checkpoint/fs.jade | 2 +-
.../configuration/clusters/checkpoint/jdbc.jade | 41 +-
.../configuration/clusters/checkpoint/s3.jade | 229 +++----
.../configuration/clusters/collision.jade | 12 +-
.../clusters/collision/custom.jade | 2 +-
.../clusters/collision/fifo-queue.jade | 2 +-
.../clusters/collision/job-stealing.jade | 2 +-
.../clusters/collision/priority-queue.jade | 2 +-
.../configuration/clusters/communication.jade | 2 +-
.../configuration/clusters/connector.jade | 2 +-
.../configuration/clusters/deployment.jade | 2 +-
.../configuration/clusters/discovery.jade | 2 +-
.../states/configuration/clusters/events.jade | 2 +-
.../states/configuration/clusters/failover.jade | 2 +-
.../states/configuration/clusters/general.jade | 2 +-
.../clusters/general/discovery/cloud.jade | 2 +-
.../clusters/general/discovery/google.jade | 2 +-
.../clusters/general/discovery/jdbc.jade | 3 +-
.../clusters/general/discovery/multicast.jade | 2 +-
.../clusters/general/discovery/s3.jade | 2 +-
.../clusters/general/discovery/shared.jade | 2 +-
.../clusters/general/discovery/vm.jade | 2 +-
.../clusters/general/discovery/zookeeper.jade | 2 +-
.../bounded-exponential-backoff.jade | 2 +-
.../discovery/zookeeper/retrypolicy/custom.jade | 2 +-
.../retrypolicy/exponential-backoff.jade | 2 +-
.../zookeeper/retrypolicy/forever.jade | 2 +-
.../zookeeper/retrypolicy/n-times.jade | 2 +-
.../zookeeper/retrypolicy/one-time.jade | 2 +-
.../zookeeper/retrypolicy/until-elapsed.jade | 2 +-
.../states/configuration/clusters/igfs.jade | 2 +-
.../configuration/clusters/load-balancing.jade | 2 +-
.../states/configuration/clusters/logger.jade | 2 +-
.../configuration/clusters/logger/custom.jade | 2 +-
.../configuration/clusters/logger/log4j.jade | 2 +-
.../configuration/clusters/logger/log4j2.jade | 2 +-
.../configuration/clusters/marshaller.jade | 2 +-
.../states/configuration/clusters/metrics.jade | 2 +-
.../states/configuration/clusters/odbc.jade | 2 +-
.../states/configuration/clusters/ssl.jade | 2 +-
.../states/configuration/clusters/swap.jade | 2 +-
.../states/configuration/clusters/thread.jade | 2 +-
.../states/configuration/clusters/time.jade | 2 +-
.../configuration/clusters/transactions.jade | 2 +-
.../states/configuration/domains/general.jade | 2 +-
.../states/configuration/domains/query.jade | 16 +-
.../states/configuration/domains/store.jade | 12 +-
.../modules/states/configuration/igfs/dual.jade | 2 +-
.../states/configuration/igfs/fragmentizer.jade | 2 +-
.../states/configuration/igfs/general.jade | 2 +-
.../modules/states/configuration/igfs/ipc.jade | 2 +-
.../modules/states/configuration/igfs/misc.jade | 6 +-
.../states/configuration/igfs/secondary.jade | 2 +-
.../configuration/summary/summary.controller.js | 12 +-
.../frontend/controllers/clusters-controller.js | 10 +
.../frontend/controllers/domains-controller.js | 8 +-
.../frontend/gulpfile.babel.js/tasks/jade.js | 4 +-
.../frontend/gulpfile.babel.js/tasks/test.js | 92 ---
.../gulpfile.babel.js/webpack/common.js | 5 +-
.../webpack/environments/development.js | 5 +
modules/web-console/frontend/package.json | 2 +-
.../stylesheets/_font-awesome-custom.scss | 18 +
.../frontend/public/stylesheets/style.scss | 13 +-
.../frontend/views/configuration/caches.jade | 22 +-
.../frontend/views/configuration/clusters.jade | 50 +-
.../views/configuration/domains-import.jade | 4 +-
.../frontend/views/configuration/domains.jade | 8 +-
.../frontend/views/configuration/igfs.jade | 14 +-
.../frontend/views/configuration/summary.jade | 2 +-
.../frontend/views/includes/header.jade | 15 +-
.../frontend/views/settings/profile.jade | 2 +-
modules/web-console/frontend/views/sql/sql.jade | 2 +-
.../views/templates/agent-download.jade | 2 +-
.../frontend/views/templates/batch-confirm.jade | 2 +-
.../frontend/views/templates/clone.jade | 2 +-
.../frontend/views/templates/confirm.jade | 2 +-
modules/web-console/web-agent/README.txt | 4 +-
.../web-agent/bin/ignite-web-agent.bat | 7 +-
.../web-agent/bin/ignite-web-agent.sh | 6 +-
.../console/agent/AgentConfiguration.java | 5 +-
.../ignite/console/agent/AgentLauncher.java | 6 +-
.../ignite/console/demo/AgentClusterDemo.java | 1 +
186 files changed, 2869 insertions(+), 1486 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/31bc3bf6/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/31bc3bf6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/31bc3bf6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/31bc3bf6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/31bc3bf6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/31bc3bf6/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------