ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [16/50] [abbrv] incubator-ignite git commit: IGNITE-575 - Renaimings
Date Wed, 25 Mar 2015 12:11:57 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
index 65bb2af..7dad58c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
@@ -129,13 +129,13 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
         assert orgCache.putx("o1", new Organization(1, "A"));
         assert orgCache.putx("o2", new Organization(2, "B"));
 
-        GridCache<CacheAffinityKey<String>, Person> personCache = ((IgniteKernal)grid(0)).getCache(null);
+        GridCache<AffinityKey<String>, Person> personCache = ((IgniteKernal)grid(0)).getCache(null);
 
         assert personCache != null;
 
-        assert personCache.putx(new CacheAffinityKey<>("p1", "o1"), new Person("John
White", 25, 1));
-        assert personCache.putx(new CacheAffinityKey<>("p2", "o1"), new Person("Joe
Black", 35, 1));
-        assert personCache.putx(new CacheAffinityKey<>("p3", "o2"), new Person("Mike
Green", 40, 2));
+        assert personCache.putx(new AffinityKey<>("p1", "o1"), new Person("John White",
25, 1));
+        assert personCache.putx(new AffinityKey<>("p2", "o1"), new Person("Joe Black",
35, 1));
+        assert personCache.putx(new AffinityKey<>("p3", "o2"), new Person("Mike Green",
40, 2));
 
         GridCache<String, String> strCache = ((IgniteKernal)grid(0)).getCache(null);
 
@@ -199,7 +199,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
                     assert types.contains("String");
                     assert types.contains("Integer");
 
-                    assert CacheAffinityKey.class.getName().equals(meta.keyClass("Person"));
+                    assert AffinityKey.class.getName().equals(meta.keyClass("Person"));
                     assert String.class.getName().equals(meta.keyClass("Organization"));
                     assert String.class.getName().equals(meta.keyClass("String"));
 
@@ -211,7 +211,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
                     assert fields != null;
                     assert fields.size() == 5;
-                    assert CacheAffinityKey.class.getName().equals(fields.get("_KEY"));
+                    assert AffinityKey.class.getName().equals(fields.get("_KEY"));
                     assert Person.class.getName().equals(fields.get("_VAL"));
                     assert String.class.getName().equals(fields.get("NAME"));
                     assert int.class.getName().equals(fields.get("AGE"));
@@ -293,17 +293,17 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
             assert row.size() == 3;
 
             if (cnt == 0) {
-                assert new CacheAffinityKey<>("p1", "o1").equals(row.get(0));
+                assert new AffinityKey<>("p1", "o1").equals(row.get(0));
                 assert "John White".equals(row.get(1));
                 assert row.get(2).equals(25);
             }
             else if (cnt == 1) {
-                assert new CacheAffinityKey<>("p2", "o1").equals(row.get(0));
+                assert new AffinityKey<>("p2", "o1").equals(row.get(0));
                 assert "Joe Black".equals(row.get(1));
                 assert row.get(2).equals(35);
             }
             if (cnt == 2) {
-                assert new CacheAffinityKey<>("p3", "o2").equals(row.get(0));
+                assert new AffinityKey<>("p3", "o2").equals(row.get(0));
                 assert "Mike Green".equals(row.get(1));
                 assert row.get(2).equals(40);
             }
@@ -343,12 +343,12 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
             assert row.size() == 3;
 
             if (cnt == 0) {
-                assert new CacheAffinityKey<>("p2", "o1").equals(row.get(0));
+                assert new AffinityKey<>("p2", "o1").equals(row.get(0));
                 assert "Joe Black".equals(row.get(1));
                 assert row.get(2).equals(35);
             }
             else if (cnt == 1) {
-                assert new CacheAffinityKey<>("p3", "o2").equals(row.get(0));
+                assert new AffinityKey<>("p3", "o2").equals(row.get(0));
                 assert "Mike Green".equals(row.get(1));
                 assert row.get(2).equals(40);
             }
@@ -436,19 +436,19 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
             assert row.size() == 4;
 
             if (cnt == 0) {
-                assert new CacheAffinityKey<>("p1", "o1").equals(row.get(0));
+                assert new AffinityKey<>("p1", "o1").equals(row.get(0));
                 assert "John White".equals(row.get(1));
                 assert row.get(2).equals(25);
                 assert "A".equals(row.get(3));
             }
             else if (cnt == 1) {
-                assert new CacheAffinityKey<>("p2", "o1").equals(row.get(0));
+                assert new AffinityKey<>("p2", "o1").equals(row.get(0));
                 assert "Joe Black".equals(row.get(1));
                 assert row.get(2).equals(35);
                 assert "A".equals(row.get(3));
             }
             if (cnt == 2) {
-                assert new CacheAffinityKey<>("p3", "o2").equals(row.get(0));
+                assert new AffinityKey<>("p3", "o2").equals(row.get(0));
                 assert "Mike Green".equals(row.get(1));
                 assert row.get(2).equals(40);
                 assert "B".equals(row.get(3));
@@ -586,7 +586,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
             assert row.size() == 9;
 
             if (cnt == 0) {
-                assert new CacheAffinityKey<>("p1", "o1").equals(row.get(0));
+                assert new AffinityKey<>("p1", "o1").equals(row.get(0));
                 assert Person.class.getName().equals(row.get(1).getClass().getName());
                 assert "John White".equals(row.get(2));
                 assert row.get(3).equals(25);
@@ -597,7 +597,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
                 assert "A".equals(row.get(8));
             }
             else if (cnt == 1) {
-                assert new CacheAffinityKey<>("p2", "o1").equals(row.get(0));
+                assert new AffinityKey<>("p2", "o1").equals(row.get(0));
                 assert Person.class.getName().equals(row.get(1).getClass().getName());
                 assert "Joe Black".equals(row.get(2));
                 assert row.get(3).equals(35);
@@ -608,7 +608,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
                 assert "A".equals(row.get(8));
             }
             if (cnt == 2) {
-                assert new CacheAffinityKey<>("p3", "o2").equals(row.get(0));
+                assert new AffinityKey<>("p3", "o2").equals(row.get(0));
                 assert Person.class.getName().equals(row.get(1).getClass().getName());
                 assert "Mike Green".equals(row.get(2));
                 assert row.get(3).equals(40);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
index 75cc527..0267379 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
@@ -65,7 +65,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest
{
         cc.setRebalanceMode(SYNC);
         cc.setSwapEnabled(true);
         cc.setNearConfiguration(new NearCacheConfiguration());
-        cc.setEvictionPolicy(new CacheFifoEvictionPolicy(1000));
+        cc.setEvictionPolicy(new FifoEvictionPolicy(1000));
         cc.setBackups(1);
         cc.setAtomicityMode(TRANSACTIONAL);
         cc.setIndexedTypes(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
index 19ed776..7f4ddfb 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
@@ -105,7 +105,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
         }
         else {
             indexedTypes.addAll(F.<Class<?>>asList(
-                CacheAffinityKey.class, Person.class
+                AffinityKey.class, Person.class
             ));
         }
 
@@ -150,13 +150,13 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends
GridCommonA
         orgCache.put("o1", new Organization(1, "A"));
         orgCache.put("o2", new Organization(2, "B"));
 
-        IgniteCache<CacheAffinityKey<String>, Person> personCache = grid(0).cache(null);
+        IgniteCache<AffinityKey<String>, Person> personCache = grid(0).cache(null);
 
         assert personCache != null;
 
-        personCache.put(new CacheAffinityKey<>("p1", "o1"), new Person("John White",
25, 1));
-        personCache.put(new CacheAffinityKey<>("p2", "o1"), new Person("Joe Black",
35, 1));
-        personCache.put(new CacheAffinityKey<>("p3", "o2"), new Person("Mike Green",
40, 2));
+        personCache.put(new AffinityKey<>("p1", "o1"), new Person("John White", 25,
1));
+        personCache.put(new AffinityKey<>("p2", "o1"), new Person("Joe Black", 35,
1));
+        personCache.put(new AffinityKey<>("p3", "o2"), new Person("Mike Green", 40,
2));
 
         IgniteCache<String, String> strCache = grid(0).cache(null);
 
@@ -218,17 +218,17 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends
GridCommonA
             assert row.size() == 3;
 
             if (cnt == 0) {
-                assert new CacheAffinityKey<>("p1", "o1").equals(row.get(0));
+                assert new AffinityKey<>("p1", "o1").equals(row.get(0));
                 assert "John White".equals(row.get(1));
                 assert row.get(2).equals(25);
             }
             else if (cnt == 1) {
-                assert new CacheAffinityKey<>("p2", "o1").equals(row.get(0));
+                assert new AffinityKey<>("p2", "o1").equals(row.get(0));
                 assert "Joe Black".equals(row.get(1));
                 assert row.get(2).equals(35);
             }
             if (cnt == 2) {
-                assert new CacheAffinityKey<>("p3", "o2").equals(row.get(0));
+                assert new AffinityKey<>("p3", "o2").equals(row.get(0));
                 assert "Mike Green".equals(row.get(1));
                 assert row.get(2).equals(40);
             }
@@ -264,12 +264,12 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends
GridCommonA
             assert row.size() == 3;
 
             if (cnt == 0) {
-                assert new CacheAffinityKey<>("p2", "o1").equals(row.get(0));
+                assert new AffinityKey<>("p2", "o1").equals(row.get(0));
                 assert "Joe Black".equals(row.get(1));
                 assert row.get(2).equals(35);
             }
             else if (cnt == 1) {
-                assert new CacheAffinityKey<>("p3", "o2").equals(row.get(0));
+                assert new AffinityKey<>("p3", "o2").equals(row.get(0));
                 assert "Mike Green".equals(row.get(1));
                 assert row.get(2).equals(40);
             }
@@ -303,7 +303,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
             assert row.size() == 9;
 
             if (cnt == 0) {
-                assert new CacheAffinityKey<>("p1", "o1").equals(row.get(0));
+                assert new AffinityKey<>("p1", "o1").equals(row.get(0));
                 assert Person.class.getName().equals(row.get(1).getClass().getName());
                 assert "John White".equals(row.get(2));
                 assert row.get(3).equals(25);
@@ -314,7 +314,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
                 assert "A".equals(row.get(8));
             }
             else if (cnt == 1) {
-                assert new CacheAffinityKey<>("p2", "o1").equals(row.get(0));
+                assert new AffinityKey<>("p2", "o1").equals(row.get(0));
                 assert Person.class.getName().equals(row.get(1).getClass().getName());
                 assert "Joe Black".equals(row.get(2));
                 assert row.get(3).equals(35);
@@ -325,7 +325,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
                 assert "A".equals(row.get(8));
             }
             if (cnt == 2) {
-                assert new CacheAffinityKey<>("p3", "o2").equals(row.get(0));
+                assert new AffinityKey<>("p3", "o2").equals(row.get(0));
                 assert Person.class.getName().equals(row.get(1).getClass().getName());
                 assert "Mike Green".equals(row.get(2));
                 assert row.get(3).equals(40);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
index 31eadd8..f21d50b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
@@ -92,7 +92,7 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes
         cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
         cacheCfg.setSwapEnabled(true);
         cacheCfg.setBackups(1);
-        cacheCfg.setEvictionPolicy(evictsEnabled() ? new CacheLruEvictionPolicy(100) : null);
+        cacheCfg.setEvictionPolicy(evictsEnabled() ? new LruEvictionPolicy(100) : null);
         cacheCfg.setSqlOnheapRowCacheSize(128);
         cacheCfg.setIndexedTypes(
             Integer.class, Integer.class,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java
index 11b750d..ecb566b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java
@@ -87,17 +87,17 @@ public class GridCachePartitionedFieldsQuerySelfTest extends GridCacheAbstractFi
             assertEquals("Row size", 3, row.size());
 
             if (cnt == 0 || cnt == 1) {
-                assertEquals("Key", new CacheAffinityKey<>("p1", "o1"), row.get(0));
+                assertEquals("Key", new AffinityKey<>("p1", "o1"), row.get(0));
                 assertEquals("Name", "John White", row.get(1));
                 assertEquals("Age", 25, row.get(2));
             }
             else if (cnt == 2 || cnt == 3) {
-                assertEquals("Key", new CacheAffinityKey<>("p2", "o1"), row.get(0));
+                assertEquals("Key", new AffinityKey<>("p2", "o1"), row.get(0));
                 assertEquals("Name", "Joe Black", row.get(1));
                 assertEquals("Age", 35, row.get(2));
             }
             else if (cnt == 4 || cnt == 5) {
-                assertEquals("Key", new CacheAffinityKey<>("p3", "o2"), row.get(0));
+                assertEquals("Key", new AffinityKey<>("p3", "o2"), row.get(0));
                 assertEquals("Name", "Mike Green", row.get(1));
                 assertEquals("Age", 40, row.get(2));
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
index 5c214bc..8703343 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
@@ -89,7 +89,7 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends
GridCom
         cache.setRebalanceMode(SYNC);
         cache.setIndexedTypes(
             String.class, Organization.class,
-            CacheAffinityKey.class, Person.class
+            AffinityKey.class, Person.class
         );
 
         if (cacheMode() == PARTITIONED)
@@ -126,13 +126,13 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends
GridCom
         assert orgCache.putx("o1", new Organization(1, "A"));
         assert orgCache.putx("o2", new Organization(2, "B"));
 
-        GridCache<CacheAffinityKey<String>, Person> personCache = ((IgniteKernal)grid(0)).getCache(null);
+        GridCache<AffinityKey<String>, Person> personCache = ((IgniteKernal)grid(0)).getCache(null);
 
         assert personCache != null;
 
-        assert personCache.putx(new CacheAffinityKey<>("p1", "o1"), new Person("John
White", 25, 1));
-        assert personCache.putx(new CacheAffinityKey<>("p2", "o1"), new Person("Joe
Black", 35, 1));
-        assert personCache.putx(new CacheAffinityKey<>("p3", "o2"), new Person("Mike
Green", 40, 2));
+        assert personCache.putx(new AffinityKey<>("p1", "o1"), new Person("John White",
25, 1));
+        assert personCache.putx(new AffinityKey<>("p2", "o1"), new Person("Joe Black",
35, 1));
+        assert personCache.putx(new AffinityKey<>("p3", "o2"), new Person("Mike Green",
40, 2));
     }
 
     /** {@inheritDoc} */
@@ -202,7 +202,7 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends
GridCom
 //        qry = qry.remoteKeyFilter(
 //            new GridPredicate<Object>() {
 //                @Override public boolean apply(Object e) {
-//                    return !"p2".equals(((CacheAffinityKey)e).key());
+//                    return !"p2".equals(((AffinityKey)e).key());
 //                }
 //            }
 //        ).remoteValueFilter(
@@ -225,16 +225,16 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends
GridCom
 //     * @throws Exception If failed.
 //     */
 //    public void testOnProjectionWithFilter() throws Exception {
-//        P2<CacheAffinityKey<String>, Person> p = new P2<CacheAffinityKey<String>,
Person>() {
-//            @Override public boolean apply(CacheAffinityKey<String> key, Person val)
{
+//        P2<AffinityKey<String>, Person> p = new P2<AffinityKey<String>,
Person>() {
+//            @Override public boolean apply(AffinityKey<String> key, Person val) {
 //                return val.orgId == 1;
 //            }
 //        };
 //
-//        CacheProjection<CacheAffinityKey<String>, Person> cachePrj =
-//            grid(0).<CacheAffinityKey<String>, Person>cache(null).projection(p);
+//        CacheProjection<AffinityKey<String>, Person> cachePrj =
+//            grid(0).<AffinityKey<String>, Person>cache(null).projection(p);
 //
-//        GridCacheReduceFieldsQuery<CacheAffinityKey<String>, Person, GridBiTuple<Integer,
Integer>, Integer> qry =
+//        GridCacheReduceFieldsQuery<AffinityKey<String>, Person, GridBiTuple<Integer,
Integer>, Integer> qry =
 //            cachePrj.queries().createReduceFieldsQuery("select age from Person");
 //
 //        qry = qry.remoteValueFilter(

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
index 8b3da49..0faa9d0 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
@@ -238,7 +238,7 @@ public class CodeGenerator {
             add1(src, "/** Value for " + fldName + ". */");
 
             if (key && field.affinityKey())
-                add1(src, "@CacheAffinityKeyMapped");
+                add1(src, "@AffinityKeyMapped");
 
             add1(src, "private " + javaTypeName(field) + " " + fldName + ";");
             add0(src, "");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
index cdd3cec..e20fda8 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
@@ -885,8 +885,8 @@ public class SchemaImportApp extends Application {
             "Check to include this field into key object");
 
         TableColumn<PojoField, Boolean> akCol = booleanColumn("AK", "affinityKey",
-            "Check to annotate key filed with @CacheAffinityKeyMapped annotation in generated
POJO class\n" +
-            "Note that a class can have only ONE key field annotated with @CacheAffinityKeyMapped
annotation");
+            "Check to annotate key filed with @AffinityKeyMapped annotation in generated
POJO class\n" +
+            "Note that a class can have only ONE key field annotated with @AffinityKeyMapped
annotation");
 
         TableColumn<PojoField, String> dbNameCol = tableColumn("DB Name", "dbName",
"Field name in database");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
index 869990f..eebde72 100644
--- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
+++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
@@ -388,7 +388,7 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea
     }
 
     /** {@inheritDoc} */
-    @Override public <K> CacheAffinity<K> affinity(String cacheName) {
+    @Override public <K> Affinity<K> affinity(String cacheName) {
         return g.affinity(cacheName);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba0b01a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
index a233eb1..5984dc2 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
@@ -104,7 +104,7 @@ public class IgniteNode implements BenchmarkServer {
                 if (args.isOffheapValues())
                     cc.setMemoryMode(OFFHEAP_VALUES);
                 else
-                    cc.setEvictionPolicy(new CacheLruEvictionPolicy(50000));
+                    cc.setEvictionPolicy(new LruEvictionPolicy(50000));
             }
 
             cc.setReadThrough(args.isStoreEnabled());


Mime
View raw message