Repository: incubator-ignite Updated Branches: refs/heads/ignite-sql-tests a13dbad86 -> af5abd0d1
ignite-sql-tests - scala compilation Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af5abd0d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af5abd0d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af5abd0d Branch: refs/heads/ignite-sql-tests Commit: af5abd0d12c9ed782095cab9da6dda27375c3e82 Parents: a13dbad Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Feb 5 11:05:57 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Feb 5 11:05:57 2015 +0300 ---------------------------------------------------------------------- .../replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java | 3 +-- .../src/main/scala/org/apache/ignite/scalar/scalar.scala | 6 +++--- .../ignite/visor/commands/cache/VisorCacheCommandSpec.scala | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af5abd0d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java index a43a04e..0774f9b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java @@ -66,8 +66,7 @@ public class IgniteCacheReplicatedFieldsQuerySelfTest extends IgniteCacheAbstrac final QueryCursor<List<?>> qry0 = qry; GridTestUtils.assertThrows(log, new Callable<Object>() { - @Override - public Object call() throws Exception { + @Override public Object call() throws Exception { int i = 0; for (List<?> row : qry0) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af5abd0d/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala index 4054952..fdb0ad9 100644 --- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala +++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala @@ -18,7 +18,7 @@ package org.apache.ignite.scalar import org.apache.ignite.cache.GridCache -import org.apache.ignite.cache.query.{CacheQuerySqlField, CacheQueryTextField} +import org.apache.ignite.cache.query.annotations.{QuerySqlField, QueryTextField} import org.apache.ignite.cluster.ClusterNode import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.internal.GridProductImpl @@ -131,10 +131,10 @@ object scalar extends ScalarConversions { private val COPYRIGHT = GridProductImpl.COPYRIGHT /** Type alias for `CacheQuerySqlField`. */ - type ScalarCacheQuerySqlField = CacheQuerySqlField @field + type ScalarCacheQuerySqlField = QuerySqlField @field /** Type alias for `CacheQueryTextField`. */ - type ScalarCacheQueryTextField = CacheQueryTextField @field + type ScalarCacheQueryTextField = QueryTextField @field /** * Prints Scalar ASCII-logo. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af5abd0d/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala index 1920f17..e2a0fe7 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala @@ -18,7 +18,7 @@ package org.apache.ignite.visor.commands.cache import org.apache.ignite.Ignition -import org.apache.ignite.cache.query.CacheQuerySqlField +import org.apache.ignite.cache.query.annotations.QuerySqlField import org.apache.ignite.visor.visor import org.scalatest._ @@ -97,6 +97,6 @@ class VisorCacheCommandSpec extends FlatSpec with Matchers with BeforeAndAfterAl * Object for queries. */ private case class Foo( - @CacheQuerySqlField + @QuerySqlField value: Int )
