ignite-sql-tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/896347bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/896347bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/896347bc Branch: refs/heads/ignite-sql-tests Commit: 896347bc55cae74ba9d1cff9aea13c9594bd0350 Parents: 323af75 Author: S.Vladykin <svlady...@gridgain.com> Authored: Tue Feb 24 02:30:41 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Tue Feb 24 02:30:41 2015 +0300 ---------------------------------------------------------------------- examples/config/example-cache.xml | 17 +++++++---- .../clients/src/test/resources/spring-cache.xml | 8 ----- .../org/apache/ignite/cache/query/Query.java | 5 ++- .../query/annotations/QuerySqlFunction.java | 2 +- .../processors/cache/query/CacheQuery.java | 2 +- .../webapp/META-INF/ignite-webapp-config.xml | 32 -------------------- 6 files changed, 15 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/896347bc/examples/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml index 2ccecf9..c685b46 100644 --- a/examples/config/example-cache.xml +++ b/examples/config/example-cache.xml @@ -149,12 +149,17 @@ <!-- Set to true to enable indexing for query examples, default value is false. --> <property name="queryIndexEnabled" value="true"/> - <!-- Allow to index primitive values. --> - <property name="queryConfiguration"> - <bean class="org.apache.ignite.configuration.CacheQueryConfiguration"> - <!-- Index primitives. --> - <property name="indexPrimitiveKey" value="true"/> - </bean> + <property name="indexedTypes"> + <list> + <bean class="org.apache.ignite.lang.IgniteBiTuple"> + <constructor-arg index="0" value="java.util.UUID"/> + <constructor-arg index="1" value="org.apache.ignite.examples.datagrid.CacheQueryExample.Organization"/> + </bean> + <bean class="org.apache.ignite.lang.IgniteBiTuple"> + <constructor-arg index="0" value="java.util.UUID"/> + <constructor-arg index="1" value="org.apache.ignite.examples.datagrid.CacheQueryExample.Person"/> + </bean> + </list> </property> </bean> </beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/896347bc/modules/clients/src/test/resources/spring-cache.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml index d34e3cc..2cccf5a 100644 --- a/modules/clients/src/test/resources/spring-cache.xml +++ b/modules/clients/src/test/resources/spring-cache.xml @@ -85,14 +85,6 @@ --> <property name="queryIndexEnabled" value="true"/> - <!-- Allow to index primitive values. --> - <property name="queryConfiguration"> - <bean class="org.apache.ignite.configuration.CacheQueryConfiguration"> - <!-- Index primitives. --> - <property name="indexPrimitiveKey" value="true"/> - </bean> - </property> - <!-- This shows how to configure number of backups. The below configuration sets the number of backups to 1 (which is default). http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/896347bc/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java b/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java index c24d704..123b274 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/Query.java @@ -18,7 +18,6 @@ package org.apache.ignite.cache.query; import org.apache.ignite.*; -import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.indexing.*; @@ -115,7 +114,7 @@ public abstract class Query<T extends Query> implements Serializable { } /** - * Gets optional page size, if {@code 0}, then {@link CacheQueryConfiguration#getPageSize()} is used. + * Gets optional page size, if {@code 0}, then default is used. * * @return Optional page size. */ @@ -124,7 +123,7 @@ public abstract class Query<T extends Query> implements Serializable { } /** - * Sets optional page size, if {@code 0}, then {@link CacheQueryConfiguration#getPageSize()} is used. + * Sets optional page size, if {@code 0}, then default is used. * * @param pageSize Optional page size. * @return {@code this} For chaining. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/896347bc/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlFunction.java index 352aa85..7d292d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlFunction.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/annotations/QuerySqlFunction.java @@ -22,7 +22,7 @@ import java.lang.annotation.*; /** * Annotates public static methods in classes to be used in SQL queries as custom functions. * Annotated class must be registered in H2 indexing SPI using following method - * {@link org.apache.ignite.configuration.QueryConfiguration#setSqlFunctionClasses(Class[])}. + * {@link org.apache.ignite.configuration.CacheConfiguration#setSqlFunctionClasses(Class[])}. * <p> * Example usage: * <pre name="code" class="java"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/896347bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java index 129d146..715421e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java @@ -53,7 +53,7 @@ import org.jetbrains.annotations.*; * <h2 class="header">Custom functions in SQL queries.</h2> * It is possible to write custom Java methods and call then form SQL queries. These methods must be public static * and annotated with {@link QuerySqlFunction}. Classes containing these methods must be registered in - * {@link org.apache.ignite.configuration.QueryConfiguration#setSqlFunctionClasses(Class[])}. + * {@link org.apache.ignite.configuration.CacheConfiguration#setSqlFunctionClasses(Class[])}. * <h1 class="header">Full Text Queries</h1> * Ignite supports full text queries based on Apache Lucene engine. This queries are created by * {@link CacheQueries#createFullTextQuery(Class, String)} method. Note that all fields that http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/896347bc/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml index 95ed478..7e0f233 100644 --- a/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml +++ b/modules/core/src/test/webapp/META-INF/ignite-webapp-config.xml @@ -116,14 +116,6 @@ --> <property name="queryIndexEnabled" value="true"/> - <!-- Allow to index primitive values. --> - <property name="queryConfiguration"> - <bean class="org.apache.ignite.configuration.CacheQueryConfiguration"> - <!-- Index primitives. --> - <property name="indexPrimitiveKey" value="true"/> - </bean> - </property> - <!-- This shows how to configure number of backups. The below configuration sets the number of backups to 1 (which is default). @@ -165,14 +157,6 @@ --> <property name="queryIndexEnabled" value="true"/> - <!-- Allow to index primitive values. --> - <property name="queryConfiguration"> - <bean class="org.apache.ignite.configuration.CacheQueryConfiguration"> - <!-- Index primitives. --> - <property name="indexPrimitiveKey" value="true"/> - </bean> - </property> - <!-- This shows how to configure number of backups. The below configuration sets the number of backups to 1 (which is default). @@ -211,14 +195,6 @@ Default value is false. --> <property name="queryIndexEnabled" value="true"/> - - <!-- Allow to index primitive values. --> - <property name="queryConfiguration"> - <bean class="org.apache.ignite.configuration.CacheQueryConfiguration"> - <!-- Index primitives. --> - <property name="indexPrimitiveKey" value="true"/> - </bean> - </property> </bean> <!-- @@ -240,14 +216,6 @@ Default value is false. --> <property name="queryIndexEnabled" value="true"/> - - <!-- Allow to index primitive values. --> - <property name="queryConfiguration"> - <bean class="org.apache.ignite.configuration.CacheQueryConfiguration"> - <!-- Index primitives. --> - <property name="indexPrimitiveKey" value="true"/> - </bean> - </property> </bean> </list> </property>
