Merge branch 'ignite-sql-tests' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-143
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1181520b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1181520b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1181520b Branch: refs/heads/ignite-143 Commit: 1181520b41879bc3594a3586c50c9afad67c67d8 Parents: f8f0699 c930607 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed Feb 11 10:36:16 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Wed Feb 11 10:36:16 2015 -0800 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 6 +- .../src/test/resources/spring-server-node.xml | 98 ++++++++++---------- .../test/resources/spring-server-ssl-node.xml | 98 ++++++++++---------- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheProcessor.java | 5 +- .../optimized/optimized-classnames.properties | 55 +++++------ .../spring-cache-client-benchmark-1.xml | 6 +- .../spring-cache-client-benchmark-2.xml | 6 +- .../spring-cache-client-benchmark-3.xml | 6 +- .../loadtests/hashmap/GridCacheTestContext.java | 2 +- .../core/src/test/webapp/META-INF/gg-config.xml | 6 +- .../hadoop/GridHadoopClassLoader.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 3 + .../query/h2/twostep/GridResultPage.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 16 +--- .../IgniteCacheQuerySelfTestSuite.java | 18 ++-- .../schema-load/src/main/java/media/style.css | 5 + .../org/apache/ignite/schema/ui/MessageBox.java | 8 +- .../apache/ignite/schema/ui/SchemaLoadApp.java | 2 +- .../commands/cache/VisorCacheCommand.scala | 2 +- pom.xml | 55 +++++++---- 21 files changed, 217 insertions(+), 188 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1181520b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1181520b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1181520b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1181520b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java ----------------------------------------------------------------------
