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 596BF200D1A for ; Mon, 9 Oct 2017 16:51:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 57CFF1609BB; Mon, 9 Oct 2017 14:51:12 +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 D6592160BF1 for ; Mon, 9 Oct 2017 16:51:10 +0200 (CEST) Received: (qmail 96776 invoked by uid 500); 9 Oct 2017 14:51:10 -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 95735 invoked by uid 99); 9 Oct 2017 14:51:09 -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, 09 Oct 2017 14:51:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DA655DFF0F; Mon, 9 Oct 2017 14:51:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Mon, 09 Oct 2017 14:51:32 -0000 Message-Id: <7b69a307bf88402ea0a4cf220f88eb32@git.apache.org> In-Reply-To: <9dec6c8609684737a8ebfe32660627ce@git.apache.org> References: <9dec6c8609684737a8ebfe32660627ce@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/29] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-3478 archived-at: Mon, 09 Oct 2017 14:51:12 -0000 Merge remote-tracking branch 'remotes/origin/master' into ignite-3478 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/921404a6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/921404a6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/921404a6 Branch: refs/heads/ignite-5937 Commit: 921404a6f5b256cf6404822bc7e439f2cad44c5d Parents: 410c84f 90624c6 Author: sboikov Authored: Mon Oct 9 13:41:58 2017 +0300 Committer: sboikov Committed: Mon Oct 9 13:41:58 2017 +0300 ---------------------------------------------------------------------- .../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 +- .../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 +- .../internal/pagemem/wal/record/DataEntry.java | 13 +- .../pagemem/wal/record/UnwrapDataEntry.java | 22 +- .../GridCacheDatabaseSharedManager.java | 2 + .../persistence/pagemem/PageMemoryImpl.java | 18 ++ .../reader/StandaloneWalRecordsIterator.java | 35 ++- .../wal/serializer/RecordV2Serializer.java | 2 +- .../cache/query/GridCacheQueryManager.java | 87 +++++- .../query/GridCacheQuerySqlMetadataJobV2.java | 154 ++++++++++ .../query/GridCacheQuerySqlMetadataV2.java | 101 +++++++ .../cache/query/GridCacheSqlMetadata.java | 8 + .../cache/query/IgniteQueryErrorCode.java | 2 +- .../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 ++- ...IgniteClientCacheInitializationFailTest.java | 18 +- .../db/wal/reader/IgniteWalReaderTest.java | 103 ++++++- .../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 +- 86 files changed, 2783 insertions(+), 645 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/921404a6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ----------------------------------------------------------------------