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/10/09 14:51:35 UTC
[28/29] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-3478' into ignite-5937
Merge remote-tracking branch 'remotes/origin/ignite-3478' into ignite-5937
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/MvccUpdateRow.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c553638a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c553638a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c553638a
Branch: refs/heads/ignite-5937
Commit: c553638a48594d110472aad27ba8218f7e92f663
Parents: 0bbbbe2 fd53c1a
Author: sboikov <sb...@gridgain.com>
Authored: Mon Oct 9 16:27:14 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Oct 9 16:27:14 2017 +0300
----------------------------------------------------------------------
assembly/release-fabric-base.xml | 1 -
.../internal/jdbc2/JdbcMetadataSelfTest.java | 28 +-
.../internal/jdbc2/JdbcStatementSelfTest.java | 130 +++++++-
.../JdbcThinAbstractDmlStatementSelfTest.java | 2 +-
.../thin/JdbcThinAutoCloseServerCursorTest.java | 8 +-
.../jdbc/thin/JdbcThinComplexQuerySelfTest.java | 2 +-
.../jdbc/thin/JdbcThinConnectionSelfTest.java | 4 +
.../JdbcThinDynamicIndexAbstractSelfTest.java | 2 +-
.../jdbc/thin/JdbcThinEmptyCacheSelfTest.java | 2 +-
.../jdbc/thin/JdbcThinMetadataSelfTest.java | 39 +--
.../JdbcThinMissingLongArrayResultsTest.java | 2 +-
.../jdbc/thin/JdbcThinNoDefaultSchemaTest.java | 5 +-
.../thin/JdbcThinPreparedStatementSelfTest.java | 2 +-
.../jdbc/thin/JdbcThinResultSetSelfTest.java | 2 +-
.../jdbc/thin/JdbcThinStatementSelfTest.java | 46 +--
.../org/apache/ignite/IgniteJdbcDriver.java | 9 +-
.../apache/ignite/configuration/WALMode.java | 9 +-
.../connection/GridClientNioTcpConnection.java | 2 +
.../internal/jdbc/thin/JdbcThinConnection.java | 6 +-
.../jdbc/thin/JdbcThinDatabaseMetadata.java | 3 +-
.../jdbc/thin/JdbcThinPreparedStatement.java | 5 +-
.../internal/jdbc/thin/JdbcThinStatement.java | 9 +-
.../internal/jdbc/thin/JdbcThinTcpIo.java | 4 +-
.../ignite/internal/jdbc2/JdbcConnection.java | 13 +
.../internal/jdbc2/JdbcDatabaseMetadata.java | 124 +++++---
.../jdbc2/JdbcQueryMultipleStatementsTask.java | 167 ++++++++++
.../ignite/internal/jdbc2/JdbcQueryTask.java | 154 +++-------
.../internal/jdbc2/JdbcQueryTaskResult.java | 120 ++++++++
.../ignite/internal/jdbc2/JdbcQueryTaskV3.java | 94 ++++++
.../ignite/internal/jdbc2/JdbcResultSet.java | 175 ++++++++---
.../ignite/internal/jdbc2/JdbcStatement.java | 270 +++++++++--------
.../internal/jdbc2/JdbcStatementResultInfo.java | 73 +++++
.../jdbc2/JdbcStreamedPreparedStatement.java | 19 +-
.../ignite/internal/pagemem/wal/WALPointer.java | 4 +-
.../internal/pagemem/wal/record/DataEntry.java | 13 +-
.../internal/pagemem/wal/record/DataRecord.java | 20 +-
.../pagemem/wal/record/SnapshotRecord.java | 58 ++++
.../pagemem/wal/record/TimeStampRecord.java | 57 ++++
.../internal/pagemem/wal/record/TxRecord.java | 52 ++--
.../pagemem/wal/record/UnwrapDataEntry.java | 22 +-
.../internal/pagemem/wal/record/WALRecord.java | 6 +-
.../processors/cache/GridCacheAdapter.java | 16 +
.../processors/cache/GridCacheMapEntry.java | 2 +
.../GridCacheDatabaseSharedManager.java | 5 +
.../persistence/pagemem/PageMemoryImpl.java | 18 ++
.../cache/persistence/wal/FileWALPointer.java | 3 +
.../wal/FileWriteAheadLogManager.java | 7 +
.../reader/StandaloneWalRecordsIterator.java | 37 ++-
.../wal/serializer/RecordDataV1Serializer.java | 6 +-
.../wal/serializer/RecordDataV2Serializer.java | 49 ++-
.../wal/serializer/RecordV2Serializer.java | 2 +-
.../wal/serializer/TxRecordSerializer.java | 3 +-
.../cache/query/GridCacheQueryManager.java | 87 +++++-
.../query/GridCacheQuerySqlMetadataJobV2.java | 154 ++++++++++
.../query/GridCacheQuerySqlMetadataV2.java | 101 +++++++
.../cache/query/GridCacheSqlMetadata.java | 8 +
.../cache/query/IgniteQueryErrorCode.java | 2 +-
.../cache/transactions/IgniteTxAdapter.java | 3 +-
.../processors/odbc/jdbc/JdbcColumnMeta.java | 10 +
.../processors/odbc/jdbc/JdbcColumnMetaV2.java | 74 +++++
.../odbc/jdbc/JdbcConnectionContext.java | 4 +-
.../odbc/jdbc/JdbcMetaColumnsResult.java | 28 +-
.../odbc/jdbc/JdbcMetaColumnsResultV2.java | 50 +++
.../odbc/jdbc/JdbcRequestHandler.java | 32 +-
.../processors/odbc/jdbc/JdbcResult.java | 8 +
.../utils/PlatformConfigurationUtils.java | 3 +
.../processors/query/GridQueryIndexing.java | 22 +-
.../processors/query/GridQueryProcessor.java | 8 +-
.../query/QueryTypeDescriptorImpl.java | 42 ++-
.../query/property/QueryBinaryProperty.java | 1 -
.../handlers/cache/GridCacheCommandHandler.java | 12 +-
.../internal/visor/query/VisorQueryTask.java | 36 ++-
.../cache/GridCacheAbstractFullApiSelfTest.java | 45 ++-
...IgniteClientCacheInitializationFailTest.java | 18 +-
.../db/wal/IgniteWalSerializerVersionTest.java | 205 ++++++++++++-
.../db/wal/reader/IgniteWalReaderTest.java | 256 +++++++++++++++-
.../query/h2/DmlStatementsProcessor.java | 26 +-
.../internal/processors/query/h2/H2Schema.java | 17 +-
.../internal/processors/query/h2/H2TypeKey.java | 64 ++++
.../processors/query/h2/IgniteH2Indexing.java | 33 +-
.../query/h2/ddl/DdlStatementsProcessor.java | 36 ++-
.../query/h2/sql/GridSqlCreateTable.java | 34 +++
.../query/h2/sql/GridSqlQueryParser.java | 58 +++-
...ynamicColumnsAbstractConcurrentSelfTest.java | 57 ++--
...umnsConcurrentAtomicPartitionedSelfTest.java | 2 +-
...lumnsConcurrentAtomicReplicatedSelfTest.java | 2 +-
...currentTransactionalPartitionedSelfTest.java | 2 +-
...ncurrentTransactionalReplicatedSelfTest.java | 5 +-
.../H2DynamicColumnsAbstractBasicSelfTest.java | 43 +++
.../cache/index/H2DynamicTableSelfTest.java | 301 +++++++++++++++++--
.../query/IgniteSqlNotNullConstraintTest.java | 2 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 47 +--
.../Cache/Query/CacheDmlQueriesTest.cs | 4 +-
.../Cache/Query/Linq/CacheLinqTest.Strings.cs | 5 +
.../Apache.Ignite.Linq/Impl/MethodVisitor.cs | 4 +
modules/web-console/backend/app/agentSocket.js | 21 +-
.../web-console/backend/app/browsersHandler.js | 9 +-
modules/web-console/backend/package.json | 4 +-
.../app/modules/agent/AgentManager.service.js | 25 +-
.../app/modules/agent/decompress.worker.js | 34 +++
.../frontend/app/modules/sql/sql.controller.js | 36 ++-
.../frontend/app/utils/SimpleWorkerPool.js | 119 ++++++++
modules/web-console/frontend/package.json | 8 +-
.../web-console/frontend/views/sql/sql.tpl.pug | 14 +-
104 files changed, 3445 insertions(+), 687 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c553638a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------