ignite-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pavlukhin <...@git.apache.org>
Subject [GitHub] ignite pull request #4631: Ignite-8149-2-merged-tc
Date Tue, 28 Aug 2018 11:53:54 GMT
GitHub user pavlukhin opened a pull request:

    https://github.com/apache/ignite/pull/4631

    Ignite-8149-2-merged-tc

    For Team City.

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/gridgain/apache-ignite ignite-8149-2-merged-tc

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/ignite/pull/4631.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #4631
    
----
commit 6e7550574fac914bbd4f8c79eface578e2a032a6
Author: Igor Seliverstov <gvvinblade@...>
Date:   2018-01-23T09:51:36Z

    Merge branch 'master' into ignite-4191
    
    # Conflicts:
    #	modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
    #	modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
    #	modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
    #	modules/core/src/main/java/org/apache/ignite/internal/sql/SqlParser.java
    #	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java

commit 033bbaa4a26f3cfc61a2a1d7bfa88adaeb8a234b
Author: Alexander Paschenko <alexander.a.paschenko@...>
Date:   2018-01-23T11:56:23Z

    Merge remote-tracking branch 'apache/master' into ignite-5571
    
    # Conflicts:
    #	modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
    #	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java

commit b0699afff4677b06022970437fe65ecc955c6da4
Author: Alexander Paschenko <alexander.a.paschenko@...>
Date:   2018-01-23T12:25:42Z

    Merge remote-tracking branch 'origin/ignite-4191' into ignite-5571
    
    # Conflicts:
    #	modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
    #	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java
    #	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java
    #	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2CachedStatementKey.java
    #	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
    #	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java
    #	modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
    #	modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java

commit ae52faf5f5170a327282344a7fe03227eadedc53
Author: Alexander Paschenko <alexander.a.paschenko@...>
Date:   2018-01-23T15:31:35Z

    IGNITE-5571 Post-merge fix

commit 5b7d0a7e79342d07b122393b5725073fb0e9033e
Author: Alexander Paschenko <alexander.a.paschenko@...>
Date:   2018-01-23T15:50:34Z

    IGNITE-5571 Post-merge fix

commit d95939a55cb0e48824c02f998dbfc77a4ed1d3dc
Author: Igor Seliverstov <gvvinblade@...>
Date:   2018-01-24T11:29:57Z

    Merge branch 'master' into ignite-4191

commit 472d6d75e573094a3b31831678eaffbaca92aa29
Author: Igor Seliverstov <gvvinblade@...>
Date:   2018-01-24T14:07:02Z

    fix after merge

commit 9c1d20e5fc7ce721180b5da20600799905c6e229
Author: rkondakov <rkondakov@...>
Date:   2018-01-31T10:28:52Z

    IGNITE-6353 Integrate mvcc support in scan query protocol

commit 8418d877a01547886125cc59aedbb2935c791ae4
Author: Igor Seliverstov <gvvinblade@...>
Date:   2018-02-01T13:52:01Z

    Merge branch 'master' into ignite-4191
    
    # Conflicts:
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java

commit 7b19fa2c0c1aed0ccc4760aeb602c5ffedb72078
Author: Igor Seliverstov <gvvinblade@...>
Date:   2018-02-01T16:52:19Z

    Fix after merge

commit 6d7a729cf587d20b5e8efd50115ad9e0bb6da56c
Author: Igor Seliverstov <gvvinblade@...>
Date:   2018-02-09T10:22:34Z

    Merge branch 'master' into ignite-4191
    
    # Conflicts:
    #	modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
    #	modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionProperties.java
    #	modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
    #	modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
    #	modules/core/src/main/java/org/apache/ignite/internal/sql/SqlKeyword.java
    #	modules/core/src/main/java/org/apache/ignite/internal/sql/SqlParser.java
    #	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java
    #	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
    #	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlan.java
    #	modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
    #	modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java

commit 2a6b32066bbe6f2164f3cffaf66c69367c801968
Author: Igor Seliverstov <gvvinblade@...>
Date:   2018-02-09T11:11:15Z

    Fix after merge

commit 1f582a3bb6bb4275f5a246b34ac74dc96ba44821
Author: devozerov <vozerov@...>
Date:   2018-02-19T09:32:26Z

    Merge branch 'master' into ignite-4191
    
    # Conflicts:
    #	modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java

commit a418b4fa04bc7843d94da28aa1e662ba3561cf62
Author: devozerov <vozerov@...>
Date:   2018-02-19T09:37:09Z

    Fixing compilation after merge.

commit 1d19848843565493f609d653ab135d753c3a9134
Author: devozerov <vozerov@...>
Date:   2018-02-19T09:45:53Z

    Merge branch 'master' into ignite-4191

commit d26be386c77044f8c7884e059b89f323ddfaafc1
Author: devozerov <vozerov@...>
Date:   2018-02-19T09:54:17Z

    Merge branch 'master' into ignite-4191

commit ef9305612babcb015845adf6d65ceaabfb7e0807
Author: devozerov <vozerov@...>
Date:   2018-02-19T09:54:42Z

    Minor.

commit 4e9285ccc5e1ccb733828f797f058746c032cb2b
Author: devozerov <vozerov@...>
Date:   2018-02-20T08:58:09Z

    IGNITE-4191: Renamed MvccVersion -> MvccSnapshot, MvccCounter -> MvccVersion.

commit 216fa2b0936eea0c220ba56e895f808b256d8f0b
Author: devozerov <vozerov@...>
Date:   2018-02-20T12:15:02Z

    IGNITE-4191: Improved version/snapshot classes hierarchy:
    1) MvccSnapshot extends MvccVersion
    2) GridCacheEntryInfo implements MvccVersion (earlier - MvccSnapshot with fake cleanup
counter and active TXes)
    3) Replaced a number of MvccSnapshot usages to MvccVersion (where applicable).

commit 39abe71830b2b56ac067daf366fd39496c2ef315
Author: rkondakov <rkondakov@...>
Date:   2018-02-20T15:28:24Z

    Small test fix.

commit 32ef91bd520e9e2473e27275c613682886667fa7
Author: devozerov <vozerov@...>
Date:   2018-02-21T09:25:47Z

    Removed some dead code from MvccProcessor, added several TODOs for further investigation.

commit fbb6fcfc2e177f4b2f9cfd07d9d290b64f3df519
Author: devozerov <vozerov@...>
Date:   2018-02-21T10:56:42Z

    TODO.

commit dcf1d43684e7ed467b128571f1de09205a0fa6bf
Author: devozerov <vozerov@...>
Date:   2018-02-21T10:58:41Z

    IGNITE-4191: Refactored search and data IO classes (naming, packaging, decoupling closures
from search rows).

commit 3b7cc356a7d814b739ec5e393dc1f78915473ac3
Author: rkondakov <rkondakov@...>
Date:   2018-02-28T11:36:02Z

    IGNITE-7583: Secondary indexes xid_max support implemented.

commit c7823960fd06e81e4a68c8df437eb2317666df7b
Author: Pavel Kuznetsov <palmihal@...>
Date:   2018-03-13T14:49:00Z

    IGNITE-4191: Fixed compilation (serialVersionUID).

commit 7c854465f5cd3cc59ca5933b9d7cd6c692bc221d
Author: Igor Seliverstov <gvvinblade@...>
Date:   2018-03-14T14:43:09Z

    Merge branch 'master' into ignite-4191
    
    # Conflicts:
    #	modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
    #	modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinStatement.java
    #	modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcBatchExecuteRequest.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
    #	modules/core/src/main/java/org/apache/ignite/internal/sql/SqlKeyword.java
    #	modules/core/src/main/java/org/apache/ignite/internal/sql/SqlParser.java
    #	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java
    #	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java
    #	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
    #	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
    #	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/ddl/DdlStatementsProcessor.java
    #	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/UpdatePlanBuilder.java
    #	modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java

commit 04d9587c188eeea7868e0d6316c6ce31f9bcc2ba
Author: Igor Seliverstov <gvvinblade@...>
Date:   2018-03-15T12:21:27Z

    IGNITE-7748 MVCC TX Implement TxLog related structures

commit 2000534e482ed25eaf0d2eb9a68ce35503a7b23e
Author: devozerov <vozerov@...>
Date:   2018-03-16T11:59:11Z

    Fixed OOME.

commit 4f6dc64de22fe7f8985d90c041858342fa36ff03
Author: Igor Seliverstov <gvvinblade@...>
Date:   2018-03-21T12:14:28Z

    IGNITE-7807 SQL TX: Store lock info inside tuples

commit 1c87ab5d3f643147878cb4bb9575b9016c593a1f
Author: Igor Seliverstov <gvvinblade@...>
Date:   2018-03-21T21:31:04Z

    IGNITE-7807 SQL TX: Store lock info inside tuples (fix tests)

----


---

Mime
View raw message