You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/04 16:15:10 UTC
[3/7] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Conflicts:
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/DbMetadataReader.java
modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/dialect/DatabaseMetadataDialect.java
modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/dialect/JdbcMetadataDialect.java
modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
modules/schema-import/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ce572078
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ce572078
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ce572078
Branch: refs/heads/ignite-843
Commit: ce572078cfcb817611c7099faf76ace6ebcbe48c
Parents: 35f0702 5e55992
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Aug 24 20:11:31 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Aug 24 20:11:31 2015 +0700
----------------------------------------------------------------------
.../handlers/DatabaseMetadataExtractor.java | 74 +++-
.../ignite/agent/remote/RemoteHandler.java | 3 +-
.../ignite/agent/testdrive/model/Car.java | 155 ++++++++
.../ignite/agent/testdrive/model/CarKey.java | 97 +++++
.../ignite/agent/testdrive/model/Country.java | 126 +++++++
.../agent/testdrive/model/CountryKey.java | 97 +++++
.../agent/testdrive/model/Department.java | 184 ++++++++++
.../agent/testdrive/model/DepartmentKey.java | 97 +++++
.../ignite/agent/testdrive/model/Employee.java | 358 +++++++++++++++++++
.../agent/testdrive/model/EmployeeKey.java | 97 +++++
.../ignite/agent/testdrive/model/Parking.java | 126 +++++++
.../agent/testdrive/model/ParkingKey.java | 97 +++++
.../test-drive/test-drive.sql | 44 ++-
.../src/main/js/agents/agent-manager.js | 17 +-
.../main/js/controllers/clusters-controller.js | 15 +
.../main/js/controllers/metadata-controller.js | 83 ++++-
.../control-center-web/src/main/js/package.json | 1 +
.../src/main/js/public/stylesheets/style.scss | 13 +
.../src/main/js/routes/agent.js | 24 +-
.../js/views/configuration/metadata-load.jade | 35 +-
.../src/main/js/views/includes/controls.jade | 29 +-
.../cache/GridCacheEvictionManager.java | 2 +-
.../distributed/GridDistributedCacheEntry.java | 4 +-
.../cache/local/GridLocalCacheEntry.java | 4 +-
.../cache/CrossCacheTxRandomOperationsTest.java | 92 +++--
.../GridCacheMultiNodeLockAbstractTest.java | 41 ++-
...idCachePartitionedMultiNodeLockSelfTest.java | 8 +-
...ridCacheReplicatedMultiNodeLockSelfTest.java | 8 +-
.../lru/LruNearEvictionPolicySelfTest.java | 29 +-
.../LruNearOnlyNearEvictionPolicySelfTest.java | 55 ++-
.../IgniteCacheFailoverTestSuite2.java | 2 +
.../ignite/schema/parser/DbMetadataReader.java | 41 ++-
.../parser/dialect/DatabaseMetadataDialect.java | 2 +-
.../parser/dialect/JdbcMetadataDialect.java | 4 +-
.../parser/dialect/MySQLMetadataDialect.java | 57 +++
.../parser/dialect/OracleMetadataDialect.java | 4 +-
.../schema/parser/DatabaseMetadataParser.java | 41 +--
.../ignite/schema/ui/SchemaImportApp.java | 18 +-
38 files changed, 1980 insertions(+), 204 deletions(-)
----------------------------------------------------------------------