Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1A5DF200B30 for ; Mon, 4 Jul 2016 21:02:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 193CB160A92; Mon, 4 Jul 2016 19:02:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C30D3160A88 for ; Mon, 4 Jul 2016 21:02:39 +0200 (CEST) Received: (qmail 27286 invoked by uid 500); 4 Jul 2016 19:02:39 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 26268 invoked by uid 99); 4 Jul 2016 19:02:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jul 2016 19:02:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 34CC3E07F4; Mon, 4 Jul 2016 19:02:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.apache.org Date: Mon, 04 Jul 2016 19:03:07 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [31/50] [abbrv] ignite git commit: Merge branch 'gridgain-7.6.1' of https://github.com/gridgain/apache-ignite archived-at: Mon, 04 Jul 2016 19:02:41 -0000 Merge branch 'gridgain-7.6.1' of https://github.com/gridgain/apache-ignite Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e5061d1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e5061d1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e5061d1 Branch: refs/heads/ignite-2949 Commit: 6e5061d169ad80bfad6d26d3f0337b0d634afde8 Parents: 8f28382 541e17d Author: Alexey Kuznetsov Authored: Mon Jun 27 10:20:03 2016 +0700 Committer: Alexey Kuznetsov Committed: Mon Jun 27 10:20:03 2016 +0700 ---------------------------------------------------------------------- .../configuration/HadoopConfiguration.java | 35 + .../org/apache/ignite/internal/IgnitionEx.java | 3 + .../processors/cache/GridCacheAdapter.java | 16 +- .../distributed/near/GridNearGetFuture.java | 8 +- .../transactions/IgniteTxLocalAdapter.java | 12 +- .../cache/transactions/IgniteTxManager.java | 20 +- .../processors/hadoop/HadoopJobInfo.java | 3 +- .../processors/igfs/IgfsDataManager.java | 14 +- .../processors/igfs/IgfsOutputStreamImpl.java | 10 +- .../internal/processors/igfs/IgfsProcessor.java | 24 - .../ignite/internal/util/IgniteUtils.java | 45 +- .../visor/compute/VisorGatewayTask.java | 3 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 7 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +- .../IgniteCacheTxIteratorSelfTest.java | 241 ++ .../cluster/GridAddressResolverSelfTest.java | 97 + .../igfs/IgfsDataManagerSelfTest.java | 6 +- .../igfs/IgfsProcessorValidationSelfTest.java | 26 - .../vm/TcpDiscoveryVmIpFinderSelfTest.java | 75 + .../testsuites/IgniteCacheTestSuite5.java | 2 + .../testsuites/IgniteKernalSelfTestSuite.java | 2 + .../processors/hadoop/HadoopClassLoader.java | 26 +- .../processors/hadoop/HadoopDefaultJobInfo.java | 8 +- .../hadoop/jobtracker/HadoopJobTracker.java | 14 +- .../child/HadoopChildProcessRunner.java | 2 +- .../processors/hadoop/v2/HadoopV2Job.java | 14 +- .../hadoop/HadoopClassLoaderTest.java | 2 +- .../processors/hadoop/HadoopSnappyTest.java | 2 +- .../processors/hadoop/HadoopTasksV1Test.java | 2 +- .../processors/hadoop/HadoopTasksV2Test.java | 2 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 2 +- .../collections/HadoopAbstractMapTest.java | 6 +- .../include/ignite/binary/binary_containers.h | 191 +- .../include/ignite/binary/binary_raw_reader.h | 25 +- .../include/ignite/binary/binary_raw_writer.h | 13 + .../include/ignite/binary/binary_reader.h | 13 + .../include/ignite/binary/binary_writer.h | 13 + .../platforms/cpp/common/include/ignite/date.h | 2 +- .../cpp/common/include/ignite/ignite_error.h | 19 +- .../cpp/common/include/ignite/timestamp.h | 2 +- .../platforms/cpp/common/src/ignite_error.cpp | 12 +- .../cpp/core/include/ignite/cache/cache.h | 186 +- .../cpp/core/include/ignite/cache/cache_entry.h | 14 +- .../include/ignite/cache/query/query_argument.h | 33 +- .../include/ignite/cache/query/query_cursor.h | 17 +- .../ignite/cache/query/query_fields_cursor.h | 11 +- .../ignite/cache/query/query_fields_row.h | 22 +- .../include/ignite/cache/query/query_scan.h | 10 +- .../core/include/ignite/cache/query/query_sql.h | 15 +- .../ignite/cache/query/query_sql_fields.h | 15 +- .../platforms/cpp/core/include/ignite/ignite.h | 21 +- .../core/include/ignite/ignite_configuration.h | 4 +- .../cpp/core/include/ignite/ignition.h | 2 +- .../include/ignite/transactions/transaction.h | 68 +- .../ignite/transactions/transaction_consts.h | 84 +- .../ignite/transactions/transaction_metrics.h | 13 +- .../include/ignite/transactions/transactions.h | 36 +- modules/platforms/cpp/core/namespaces.dox | 2 +- modules/platforms/cpp/cpp.dxg | 4 +- modules/schema-import/README.txt | 12 +- modules/web-agent/README.txt | 25 +- .../web-agent/assembly/release-web-agent.xml | 2 - modules/web-agent/bin/ignite-web-agent.bat | 2 +- modules/web-agent/bin/ignite-web-agent.sh | 2 +- modules/web-agent/pom.xml | 22 +- .../console/agent/AgentConfiguration.java | 53 +- .../ignite/console/agent/AgentLauncher.java | 21 +- .../ignite/console/demo/AgentClusterDemo.java | 82 +- modules/web-console/README.txt | 4 +- modules/web-console/src/main/js/.eslintrc | 7 +- .../src/main/js/app/data/getting-started.json | 2 +- .../src/main/js/app/data/pom-dependencies.json | 20 + .../directives/ui-ace-docker/ui-ace-docker.jade | 4 +- .../ui-ace-java/ui-ace-java.directive.js | 4 +- .../directives/ui-ace-pojos/ui-ace-pojos.jade | 4 +- .../ui-ace-xml/ui-ace-xml.directive.js | 4 +- .../src/main/js/app/helpers/jade/mixins.jade | 17 +- modules/web-console/src/main/js/app/index.js | 18 +- .../src/main/js/app/modules/Demo/Demo.module.js | 14 +- .../QueryNotebooks/QueryNotebooks.provider.js | 115 - .../main/js/app/modules/agent/agent.module.js | 323 +++ .../configuration/generator/Pom.service.js | 46 +- .../form/field/input/datalist.directive.js | 6 +- .../modules/form/field/input/text.directive.js | 9 +- .../js/app/modules/form/field/input/text.jade | 2 +- .../app/modules/form/group/group.directive.js | 6 +- .../form/validator/java-keywords.directive.js | 9 +- .../src/main/js/app/modules/loading/loading.css | 2 +- .../query-notebooks/query-notebooks.module.js | 115 + .../app/modules/states/configuration.state.js | 32 +- .../states/configuration/caches/general.jade | 2 +- .../states/configuration/caches/store.jade | 37 +- .../clusters/attributes.directive.js | 27 + .../configuration/clusters/attributes.jade | 58 + .../states/configuration/clusters/binary.jade | 12 +- .../clusters/collision.directive.js | 27 + .../configuration/clusters/collision.jade | 60 + .../clusters/collision/custom.directive.js | 27 + .../clusters/collision/custom.jade | 24 + .../clusters/collision/fifo-queue.directive.js | 27 + .../clusters/collision/fifo-queue.jade | 28 + .../collision/job-stealing.directive.js | 27 + .../clusters/collision/job-stealing.jade | 64 + .../collision/priority-queue.directive.js | 27 + .../clusters/collision/priority-queue.jade | 43 + .../configuration/clusters/communication.jade | 30 +- .../configuration/clusters/deployment.jade | 31 +- .../configuration/clusters/discovery.jade | 4 +- .../clusters/failover.directive.js | 27 + .../states/configuration/clusters/failover.jade | 82 + .../states/configuration/clusters/general.jade | 20 +- .../clusters/general/discovery/cloud.jade | 6 +- .../clusters/general/discovery/google.jade | 11 +- .../clusters/general/discovery/s3.jade | 4 +- .../clusters/general/discovery/zookeeper.jade | 21 +- .../bounded-exponential-backoff.jade | 6 +- .../discovery/zookeeper/retrypolicy/custom.jade | 6 +- .../retrypolicy/exponential-backoff.jade | 6 +- .../zookeeper/retrypolicy/forever.jade | 2 +- .../zookeeper/retrypolicy/n-times.jade | 2 +- .../zookeeper/retrypolicy/one-time.jade | 2 +- .../zookeeper/retrypolicy/until-elapsed.jade | 4 +- .../states/configuration/clusters/igfs.jade | 4 +- .../configuration/clusters/logger.directive.js | 27 + .../states/configuration/clusters/logger.jade | 65 + .../clusters/logger/custom.directive.js | 27 + .../configuration/clusters/logger/custom.jade | 24 + .../clusters/logger/log4j.directive.js | 27 + .../configuration/clusters/logger/log4j.jade | 49 + .../clusters/logger/log4j2.directive.js | 27 + .../configuration/clusters/logger/log4j2.jade | 38 + .../states/configuration/domains/query.jade | 4 +- .../states/configuration/domains/store.jade | 2 +- .../modules/states/configuration/igfs/misc.jade | 2 +- .../main/js/app/modules/user/Auth.service.js | 19 +- .../js/app/services/AgentMonitor.service.js | 337 --- .../src/main/js/app/services/cleanup.service.js | 4 +- .../src/main/js/build/system.config.js | 55 +- .../src/main/js/controllers/admin-controller.js | 14 +- .../main/js/controllers/caches-controller.js | 336 ++- .../main/js/controllers/clusters-controller.js | 537 +++-- .../src/main/js/controllers/common-module.js | 1052 +++++---- .../main/js/controllers/domains-controller.js | 847 ++++--- .../src/main/js/controllers/igfs-controller.js | 212 +- .../main/js/controllers/profile-controller.js | 60 +- .../src/main/js/controllers/sql-controller.js | 2173 +++++++++--------- .../src/main/js/generator/generator-common.js | 151 +- .../src/main/js/generator/generator-java.js | 998 ++++---- .../src/main/js/generator/generator-optional.js | 2 +- .../main/js/generator/generator-properties.js | 25 +- .../src/main/js/generator/generator-readme.js | 6 +- .../src/main/js/generator/generator-xml.js | 430 +++- .../main/js/gulpfile.babel.js/tasks/eslint.js | 3 + .../src/main/js/public/images/cluster.png | Bin 29670 -> 29376 bytes .../src/main/js/public/images/query-table.png | Bin 42253 -> 29189 bytes .../src/main/js/public/stylesheets/style.scss | 28 + modules/web-console/src/main/js/serve/agent.js | 222 +- .../web-console/src/main/js/serve/browser.js | 120 +- .../web-console/src/main/js/serve/configure.js | 1 + modules/web-console/src/main/js/serve/mongo.js | 58 +- .../src/main/js/serve/routes/agent.js | 3 +- .../src/main/js/serve/routes/caches.js | 4 +- .../src/main/js/serve/routes/clusters.js | 8 +- .../src/main/js/serve/routes/igfs.js | 2 +- .../src/main/js/serve/routes/profile.js | 11 +- .../src/main/js/serve/routes/public.js | 35 +- .../main/js/views/configuration/clusters.jade | 4 + .../js/views/configuration/domains-import.jade | 325 +-- .../src/main/js/views/settings/profile.jade | 14 +- .../web-console/src/main/js/views/signin.jade | 26 +- .../src/main/js/views/sql/cache-metadata.jade | 2 +- .../web-console/src/main/js/views/sql/sql.jade | 205 +- 172 files changed, 7375 insertions(+), 4567 deletions(-) ----------------------------------------------------------------------