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 2017/06/09 14:21:31 UTC
[22/24] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5272-atomic
Merge remote-tracking branch 'remotes/origin/master' into ignite-5272-atomic
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ace04c45
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ace04c45
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ace04c45
Branch: refs/heads/ignite-5272-atomic
Commit: ace04c459e587919c3470928f2c6b20729748924
Parents: e164297 72e2f88
Author: sboikov <sb...@gridgain.com>
Authored: Fri Jun 9 16:53:03 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Jun 9 16:53:03 2017 +0300
----------------------------------------------------------------------
config/ignite-log4j.xml | 6 +-
config/ignite-log4j2.xml | 6 +-
.../ClientTcpUnreachableMultiNodeSelfTest.java | 6 +-
modules/clients/src/test/resources/log4j.xml | 2 +-
.../configuration/IgniteConfiguration.java | 6 +
.../ignite/internal/binary/BinaryContext.java | 1 -
.../ignite/internal/binary/BinaryFieldEx.java | 5 +
.../ignite/internal/binary/BinaryFieldImpl.java | 5 +
.../ignite/internal/client/GridClientNode.java | 9 +-
.../client/impl/GridClientNodeImpl.java | 22 +-
.../connection/GridClientNioTcpConnection.java | 3 +-
.../processors/cache/ClusterCachesInfo.java | 30 ++-
.../processors/cache/GridCacheAttributes.java | 17 +-
.../PlatformDotNetConfigurationClosure.java | 8 +-
.../utils/PlatformConfigurationUtils.java | 8 +
.../query/DynamicTableAffinityKeyMapper.java | 92 ++++++++
.../processors/query/GridQueryProcessor.java | 59 +++---
.../internal/processors/query/QueryUtils.java | 19 +-
.../rest/client/message/GridClientNodeBean.java | 25 +++
.../top/GridTopologyCommandHandler.java | 1 +
.../visor/query/VisorQueryIndexField.java | 32 +--
modules/core/src/test/config/log4j-test.xml | 6 +-
modules/core/src/test/config/log4j2-test.xml | 6 +-
.../src/test/config/log4j2-verbose-test.xml | 4 +-
.../processors/cache/IgniteCacheGroupsTest.java | 98 +++++----
.../loadtest/GridSingleExecutionTest.java | 4 +-
.../cache/GridCacheAbstractLoadTest.java | 4 +-
.../testframework/junits/GridAbstractTest.java | 4 +-
.../junits/logger/GridTestLog4jLogger.java | 4 +-
.../query/h2/ddl/DdlStatementsProcessor.java | 5 +-
.../processors/query/h2/opt/GridH2Table.java | 5 +-
.../query/h2/sql/GridSqlCreateTable.java | 37 +++-
.../processors/query/h2/sql/GridSqlJoin.java | 7 +
.../query/h2/sql/GridSqlQueryParser.java | 54 +++++
.../query/h2/sql/GridSqlQuerySplitter.java | 82 ++++++-
.../h2/twostep/msg/GridH2IndexRangeRequest.java | 2 +
.../cache/index/H2DynamicTableSelfTest.java | 212 +++++++++++++++++--
.../query/IgniteSqlSplitterSelfTest.java | 50 +++++
.../apache/ignite/logger/log4j/Log4JLogger.java | 4 +-
.../log4j/GridLog4jCorrectFileNameTest.java | 2 +-
.../ignite/logger/log4j2/Log4J2Logger.java | 2 +-
.../impls/matrix/SparseDistributedMatrix.java | 9 -
.../matrix/SparseDistributedMatrixTest.java | 9 -
.../Cache/CacheConfigurationTest.cs | 10 +
.../Config/Log/dotnet-log4j.xml | 2 +-
.../IgniteConfigurationSerializerTest.cs | 11 +-
.../IgniteConfigurationTest.cs | 4 +
.../Cache/Configuration/CacheConfiguration.cs | 23 ++
.../Datastream/IDataStreamer.cs | 8 +-
.../Apache.Ignite.Core/IgniteConfiguration.cs | 20 ++
.../IgniteConfigurationSection.xsd | 12 ++
.../src/main/java/log4j.properties | 2 +-
modules/web-console/backend/.gitignore | 1 +
modules/web-console/frontend/.gitignore | 1 +
.../frontend/controllers/domains-controller.js | 169 ++++++++-------
.../views/configuration/domains-import.tpl.pug | 4 +-
.../apache/ignite/console/agent/AgentUtils.java | 24 +--
.../ignite/console/agent/db/DbColumn.java | 17 +-
.../ignite/console/agent/db/DbSchema.java | 60 ++++++
.../apache/ignite/console/agent/db/DbTable.java | 21 +-
.../db/dialect/DatabaseMetadataDialect.java | 27 ++-
.../agent/db/dialect/JdbcMetadataDialect.java | 42 +++-
.../agent/db/dialect/OracleMetadataDialect.java | 116 ++++++++--
.../agent/handlers/DatabaseListener.java | 18 +-
.../src/main/resources/log4j.properties | 6 +-
.../yardstick/cache/load/model/ModelUtil.java | 1 +
66 files changed, 1219 insertions(+), 352 deletions(-)
----------------------------------------------------------------------