http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8be3faa7/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 37755e9..1a26615 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.{QueryTextField, QuerySqlField} import org.apache.ignite.cluster.ClusterNode import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.internal.IgniteVersionUtils @@ -129,10 +129,10 @@ import scala.annotation.meta.field */ object scalar extends ScalarConversions { /** 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/8be3faa7/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 76f2444..e023275 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 ) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8be3faa7/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java index b0c3e8d..d8bba98 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Organization.java @@ -17,7 +17,7 @@ package org.apache.ignite.yardstick.cache.model; -import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import java.io.*; @@ -26,11 +26,11 @@ import java.io.*; */ public class Organization implements Externalizable { /** Organization ID. */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private int id; /** Organization name. */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private String name; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8be3faa7/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java index fd7cd73..df8d58b 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person.java @@ -17,7 +17,7 @@ package org.apache.ignite.yardstick.cache.model; -import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.annotations.*; import java.io.*; @@ -26,23 +26,23 @@ import java.io.*; */ public class Person implements Externalizable { /** Person ID. */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private int id; /** Organization ID. */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private int orgId; /** First name (not-indexed). */ - @CacheQuerySqlField + @QuerySqlField private String firstName; /** Last name (not indexed). */ - @CacheQuerySqlField + @QuerySqlField private String lastName; /** Salary. */ - @CacheQuerySqlField(index = true) + @QuerySqlField(index = true) private double salary; /**
