ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [44/50] [abbrv] incubator-ignite git commit: Merge branch ignite-sql-tests into ignite-45
Date Mon, 16 Mar 2015 09:23:31 GMT
Merge branch ignite-sql-tests into ignite-45


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b87eefae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b87eefae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b87eefae

Branch: refs/heads/ignite-421
Commit: b87eefaeacbf2fe1aeed4c4cac394038f4a3ddd2
Parents: 3df716d 59528bd
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Sun Mar 15 22:26:55 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Sun Mar 15 22:26:55 2015 -0700

----------------------------------------------------------------------
 bin/ignite-schema-import.bat                    |   2 +-
 bin/ignite-schema-import.sh                     |   4 +-
 examples/config/store/example-database.script   |  22 +--
 .../config/store/example-jdbc-pojo-store.xml    | 142 ----------------
 .../store/CacheNodeWithStoreStartup.java        |  45 ++++-
 .../datagrid/store/CacheStoreExample.java       |  19 +++
 .../store/jdbc/CacheJdbcPojoPersonStore.java    |  11 --
 .../examples/datagrid/store/model/Person.java   |   2 +-
 .../datagrid/store/model/PersonKey.java         |  97 -----------
 .../processors/cache/IgniteCacheProxy.java      |  16 +-
 .../core/src/test/config/store/jdbc/Ignite.xml  |   2 +-
 .../test/config/websession/example-cache.xml    | 164 +++++++++++++++++++
 .../cache/store/jdbc/model/Organization.java    |   2 +-
 .../cache/store/jdbc/model/OrganizationKey.java |   2 +-
 .../ignite/cache/store/jdbc/model/Person.java   |   2 +-
 .../store/jdbc/model/PersonComplexKey.java      |   2 +-
 .../cache/store/jdbc/model/PersonKey.java       |   2 +-
 ...idCacheConfigurationConsistencySelfTest.java |   1 -
 ...ridCacheConfigurationValidationSelfTest.java |   3 +
 .../processors/query/h2/sql/GridSqlElement.java |   4 +-
 .../query/h2/sql/GridSqlQueryParser.java        |  15 +-
 .../query/h2/sql/GridSqlQuerySplitter.java      |   6 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |  10 +-
 .../cache/IgniteCacheAbstractQuerySelfTest.java |  23 +--
 .../IgniteCacheQueryNodeRestartSelfTest.java    |   5 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |  10 --
 .../IgniteCacheQuerySelfTestSuite.java          |   2 +-
 .../internal/websession/WebSessionSelfTest.java |   2 +-
 28 files changed, 295 insertions(+), 322 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b87eefae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b87eefae/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b87eefae/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b87eefae/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java
index 1518e09,8dd53aa..678d925
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java
@@@ -73,12 -73,16 +73,15 @@@ public class IgniteCacheQueryNodeRestar
  
          c.setDiscoverySpi(disco);
  
-         CacheConfiguration cc = defaultCacheConfiguration();
 -        CacheConfiguration<?,?> cc = defaultCacheConfiguration();
++        CacheConfiguration<?, ?> cc = defaultCacheConfiguration();
  
          cc.setCacheMode(PARTITIONED);
          cc.setBackups(1);
          cc.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
          cc.setAtomicityMode(TRANSACTIONAL);
 -        cc.setDistributionMode(NEAR_PARTITIONED);
+         cc.setIndexedTypes(
+             Integer.class, Integer.class
+         );
  
          c.setCacheConfiguration(cc);
  


Mime
View raw message