ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [48/52] [abbrv] incubator-ignite git commit: # Renaming
Date Fri, 05 Dec 2014 14:07:49 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
index 0ae13c5..8e8bccb 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
@@ -107,7 +107,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
      * @param primitives Whether to index primitives.
      * @return Indexing SPI.
      */
-    private GridIndexingSpi indexing(@Nullable String name, boolean primitives) {
+    private IndexingSpi indexing(@Nullable String name, boolean primitives) {
         GridH2IndexingSpi spi = new GridH2IndexingSpi();
 
         if (name != null)
@@ -379,17 +379,17 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
         GridCacheQueryFuture<List<?>> fut = qry.execute();
 
-        List<GridIndexingFieldMetadata> meta = metadata(fut);
+        List<IndexingFieldMetadata> meta = metadata(fut);
 
         assert meta != null;
         assert meta.size() == 4;
 
-        Iterator<GridIndexingFieldMetadata> metaIt = meta.iterator();
+        Iterator<IndexingFieldMetadata> metaIt = meta.iterator();
 
         assert metaIt != null;
         assert metaIt.hasNext();
 
-        GridIndexingFieldMetadata field = metaIt.next();
+        IndexingFieldMetadata field = metaIt.next();
 
         assert field != null;
         assert "PUBLIC".equals(field.schemaName());
@@ -479,17 +479,17 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
         GridCacheQueryFuture<List<?>> fut = qry.execute();
 
-        List<GridIndexingFieldMetadata> meta = metadata(fut);
+        List<IndexingFieldMetadata> meta = metadata(fut);
 
         assert meta != null;
         assert meta.size() == 9;
 
-        Iterator<GridIndexingFieldMetadata> metaIt = meta.iterator();
+        Iterator<IndexingFieldMetadata> metaIt = meta.iterator();
 
         assert metaIt != null;
         assert metaIt.hasNext();
 
-        GridIndexingFieldMetadata field = metaIt.next();
+        IndexingFieldMetadata field = metaIt.next();
 
         assert field != null;
         assert "PUBLIC".equals(field.schemaName());
@@ -645,12 +645,12 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
         assert fut != null;
 
-        List<GridIndexingFieldMetadata> meta = metadata(fut);
+        List<IndexingFieldMetadata> meta = metadata(fut);
 
         assert meta != null;
         assert meta.size() == 1;
 
-        GridIndexingFieldMetadata field = F.first(meta);
+        IndexingFieldMetadata field = F.first(meta);
 
         assert field != null;
         assert "PUBLIC".equals(field.schemaName());
@@ -689,16 +689,16 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
         GridCacheQueryFuture<List<?>> fut = qry.execute();
 
-        List<GridIndexingFieldMetadata> meta = metadata(fut);
+        List<IndexingFieldMetadata> meta = metadata(fut);
 
         assert meta != null;
         assert meta.size() == 4;
 
-        Iterator<GridIndexingFieldMetadata> metaIt = meta.iterator();
+        Iterator<IndexingFieldMetadata> metaIt = meta.iterator();
 
         assert metaIt.hasNext();
 
-        GridIndexingFieldMetadata field = metaIt.next();
+        IndexingFieldMetadata field = metaIt.next();
 
         assert field != null;
         assert "INTEGER".equals(field.typeName());
@@ -1109,7 +1109,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
      * @return Metadata.
      * @throws GridException In case of error.
      */
-    private List<GridIndexingFieldMetadata> metadata(GridCacheQueryFuture<List<?>>
fut) throws GridException {
+    private List<IndexingFieldMetadata> metadata(GridCacheQueryFuture<List<?>>
fut) throws GridException {
         assert fut != null;
 
         return ((GridCacheQueryMetadataAware)fut).metadata().get();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
index 2ca2561..db9cf0b 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
@@ -51,7 +51,7 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie
         hasCache = true;
 
         try {
-            final Map<UUID, Map<Long, GridFutureAdapter<GridIndexingFieldsResult>>>
map =
+            final Map<UUID, Map<Long, GridFutureAdapter<IndexingFieldsResult>>>
map =
                 U.field(((GridKernal)grid(0)).internalCache().context().queries(), "fieldsQryRes");
 
             // Ensure that iterators map empty.
@@ -82,7 +82,7 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie
                 }
             }, getTestTimeout()));
 
-            Map<Long, GridFutureAdapter<GridIndexingFieldsResult>> futs = map.get(g.cluster().localNode().id());
+            Map<Long, GridFutureAdapter<IndexingFieldsResult>> futs = map.get(g.cluster().localNode().id());
 
             assertEquals(1, futs.size());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
index 1a5a680..bfb6803 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
@@ -239,7 +239,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf
      * @return {@code qryIters} of {@link GridCacheQueryManager}.
      */
     private ConcurrentMap<UUID,
-        Map<Long, GridFutureAdapter<GridCloseableIterator<GridIndexingKeyValueRow<CacheKey,
CacheValue>>>>>
+        Map<Long, GridFutureAdapter<GridCloseableIterator<IndexingKeyValueRow<CacheKey,
CacheValue>>>>>
         distributedQueryManagerQueryItersMap(Ignite g) {
         GridCacheContext ctx = ((GridKernal)g).internalCache().context();
 
@@ -248,7 +248,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf
         qryItersField.setAccessible(true);
 
         return (ConcurrentMap<UUID,
-            Map<Long, GridFutureAdapter<GridCloseableIterator<GridIndexingKeyValueRow<CacheKey,
CacheValue>>>>>)
+            Map<Long, GridFutureAdapter<GridCloseableIterator<IndexingKeyValueRow<CacheKey,
CacheValue>>>>>)
             ReflectionUtils.getField(qryItersField, ctx.queries());
     }
 
@@ -397,7 +397,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf
             assertEquals(0, (int)fut.next().getKey());
 
             final ConcurrentMap<UUID, Map<Long, GridFutureAdapter<GridCloseableIterator<
-                GridIndexingKeyValueRow<Integer, Integer>>>>> map =
+                IndexingKeyValueRow<Integer, Integer>>>>> map =
                 U.field(((GridKernal)grid(0)).internalCache().context().queries(), "qryIters");
 
             // fut.nextX() does not guarantee the request has completed on remote node
@@ -408,12 +408,12 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf
                 }
             }, getTestTimeout()));
 
-            Map<Long, GridFutureAdapter<GridCloseableIterator<GridIndexingKeyValueRow<Integer,
Integer>>>> futs =
+            Map<Long, GridFutureAdapter<GridCloseableIterator<IndexingKeyValueRow<Integer,
Integer>>>> futs =
                 map.get(g.cluster().localNode().id());
 
             assertEquals(1, futs.size());
 
-            IgniteSpiCloseableIterator<GridIndexingKeyValueRow<Integer, Integer>>
iter =
+            IgniteSpiCloseableIterator<IndexingKeyValueRow<Integer, Integer>>
iter =
                 U.field(((IgniteFuture)F.first(futs.values()).get()).get(), "iter");
 
             ResultSet rs = U.field(iter, "data");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java
b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java
index 251fc01..461f62e 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/GridIndexingSpiAbstractSelfTest.java
@@ -26,7 +26,7 @@ import java.util.concurrent.*;
 /**
  * Tests for all SQL based indexing SPI implementations.
  */
-public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
+public abstract class GridIndexingSpiAbstractSelfTest<X extends IndexingSpi>
     extends GridSpiAbstractTest<X> {
     /** */
     private static final TextIndex textIdx = new TextIndex(F.asList("txt"));
@@ -126,8 +126,8 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
      * @return Indexing entity.
      * @throws GridException If failed.
      */
-    private <T> GridIndexingEntity<T> entity(T val) throws GridException {
-        return new GridIndexingEntityAdapter<>(val, getTestResources().getMarshaller().marshal(val));
+    private <T> IndexingEntity<T> entity(T val) throws GridException {
+        return new IndexingEntityAdapter<>(val, getTestResources().getMarshaller().marshal(val));
     }
 
     /**
@@ -135,7 +135,7 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
      * @return Value.
      * @throws org.apache.ignite.spi.IgniteSpiException If failed.
      */
-    private Map<String, Object> value(GridIndexingKeyValueRow<Integer, Map<String,
Object>> row) throws IgniteSpiException {
+    private Map<String, Object> value(IndexingKeyValueRow<Integer, Map<String,
Object>> row) throws IgniteSpiException {
         return row.value().value();
     }
 
@@ -173,8 +173,8 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
         assertFalse(spi.query(typeBA.space(), "select * from B.A", Collections.emptySet(),
typeBA, null).hasNext());
 
         // Nothing to remove.
-        assertFalse(spi.remove("A", new GridIndexingEntityAdapter<>(1, null)));
-        assertFalse(spi.remove("B", new GridIndexingEntityAdapter<>(1, null)));
+        assertFalse(spi.remove("A", new IndexingEntityAdapter<>(1, null)));
+        assertFalse(spi.remove("B", new IndexingEntityAdapter<>(1, null)));
 
         spi.store(typeAA.space(), typeAA, entity(1), entity(aa(1, "Vasya", 10)), "v1".getBytes(),
0);
 
@@ -223,7 +223,7 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
         assertEquals(1, spi.size(typeBA.space(), typeBA));
 
         // Query data.
-        Iterator<GridIndexingKeyValueRow<Integer, Map<String, Object>>>
res =
+        Iterator<IndexingKeyValueRow<Integer, Map<String, Object>>> res
=
             spi.query(typeAA.space(), "select * from a order by age", Collections.emptySet(),
typeAA, null);
 
         assertTrue(res.hasNext());
@@ -247,7 +247,7 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
         assertFalse(res.hasNext());
 
         // Text queries
-        Iterator<GridIndexingKeyValueRow<Integer, Map<String, Object>>>
txtRes = spi.queryText(typeAB.space(), "good",
+        Iterator<IndexingKeyValueRow<Integer, Map<String, Object>>> txtRes
= spi.queryText(typeAB.space(), "good",
             typeAB, null);
 
         assertTrue(txtRes.hasNext());
@@ -255,7 +255,7 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
         assertFalse(txtRes.hasNext());
 
         // Fields query
-        GridIndexingFieldsResult fieldsRes =
+        IndexingFieldsResult fieldsRes =
             spi.queryFields(null, "select a.a.name n1, a.a.age a1, b.a.name n2, " +
             "b.a.age a2 from a.a, b.a where a.a.id = b.a.id ", Collections.emptySet(), null);
 
@@ -264,13 +264,13 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
 
         assertTrue(fieldsRes.iterator().hasNext());
 
-        List<GridIndexingEntity<?>> fields = fieldsRes.iterator().next();
+        List<IndexingEntity<?>> fields = fieldsRes.iterator().next();
 
         assertEquals(4, fields.size());
 
         int i = 0;
 
-        for (GridIndexingEntity<?> f : fields) {
+        for (IndexingEntity<?> f : fields) {
             assertEquals(aliases[i], fieldsRes.metaData().get(i).fieldName());
             assertEquals(vals[i++], f.value());
         }
@@ -366,7 +366,7 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
                 time = now;
                 range *= 3;
 
-                GridIndexingFieldsResult res = spi.queryFields(null, sql, Arrays.<Object>asList(1,
range), null);
+                IndexingFieldsResult res = spi.queryFields(null, sql, Arrays.<Object>asList(1,
range), null);
 
                 assert res.iterator().hasNext();
 
@@ -420,7 +420,7 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
 
             String sql = "SELECT * FROM MyNonExistingTable";
 
-            GridIndexingFieldsResult res = spi.queryFields(null, sql, Collections.emptyList(),
null);
+            IndexingFieldsResult res = spi.queryFields(null, sql, Collections.emptyList(),
null);
 
             assertFalse(res.iterator().hasNext());
 
@@ -439,7 +439,7 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
     /**
      * Index descriptor.
      */
-    private static class TextIndex implements GridIndexDescriptor {
+    private static class TextIndex implements IndexDescriptor {
         /** */
         private final Collection<String> fields;
 
@@ -461,15 +461,15 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
         }
 
         /** {@inheritDoc} */
-        @Override public GridIndexType type() {
-            return GridIndexType.FULLTEXT;
+        @Override public IndexType type() {
+            return IndexType.FULLTEXT;
         }
     }
 
     /**
      * Type descriptor.
      */
-    private static class TypeDesc implements GridIndexingTypeDescriptor {
+    private static class TypeDesc implements IndexingTypeDescriptor {
         /** */
         private final String name;
 
@@ -480,7 +480,7 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
         private final Map<String, Class<?>> valFields;
 
         /** */
-        private final GridIndexDescriptor textIdx;
+        private final IndexDescriptor textIdx;
 
         /**
          * @param space Space name.
@@ -488,7 +488,7 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
          * @param valFields Fields.
          * @param textIdx Fulltext index.
          */
-        private TypeDesc(String space, String name, Map<String, Class<?>> valFields,
GridIndexDescriptor textIdx) {
+        private TypeDesc(String space, String name, Map<String, Class<?>> valFields,
IndexDescriptor textIdx) {
             this.name = name;
             this.space = space;
             this.valFields = Collections.unmodifiableMap(valFields);
@@ -526,8 +526,8 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
         }
 
         /** */
-        @Override public Map<String, GridIndexDescriptor> indexes() {
-            return textIdx == null ? Collections.<String, GridIndexDescriptor>emptyMap()
:
+        @Override public Map<String, IndexDescriptor> indexes() {
+            return textIdx == null ? Collections.<String, IndexDescriptor>emptyMap()
:
                 Collections.singletonMap("index", textIdx);
         }
 
@@ -550,7 +550,7 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
     /**
      * Indexing marshaller.
      */
-    private static class IdxMarshaller implements GridIndexingMarshaller {
+    private static class IdxMarshaller implements IndexingMarshaller {
         /** */
         private final IgniteMarshaller marshaller;
 
@@ -562,9 +562,9 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
         }
 
         /** {@inheritDoc} */
-        @Override public <T> GridIndexingEntity<T> unmarshal(byte[] bytes) throws
IgniteSpiException {
+        @Override public <T> IndexingEntity<T> unmarshal(byte[] bytes) throws
IgniteSpiException {
             try {
-                return new GridIndexingEntityAdapter<>(
+                return new IndexingEntityAdapter<>(
                     (T)marshaller.unmarshal(bytes, getClass().getClassLoader()), bytes);
             }
             catch (GridException e) {
@@ -573,7 +573,7 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
         }
 
         /** {@inheritDoc} */
-        @Override public byte[] marshal(GridIndexingEntity<?> entity) throws IgniteSpiException
{
+        @Override public byte[] marshal(IndexingEntity<?> entity) throws IgniteSpiException
{
             if (entity.bytes() != null)
                 return entity.bytes();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexRebuildTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexRebuildTest.java
b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexRebuildTest.java
index 5a3045a..e91c607 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexRebuildTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/GridH2IndexRebuildTest.java
@@ -45,7 +45,7 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest {
         private volatile boolean interrupted;
 
         /** {@inheritDoc} */
-        @Override public void rebuildIndexes(@Nullable String spaceName, GridIndexingTypeDescriptor
type) {
+        @Override public void rebuildIndexes(@Nullable String spaceName, IndexingTypeDescriptor
type) {
             if (sleepInRebuild) {
                 try {
                     U.sleep(Long.MAX_VALUE);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dec83ed4/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java
b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java
index 6ab3511..26b360c 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java
@@ -29,7 +29,7 @@ public class GridLuceneIndexLoadTest {
     public static void main(String ... args) throws IgniteSpiException, FileNotFoundException
{
         final IgniteOptimizedMarshaller m = new IgniteOptimizedMarshaller();
 
-        GridIndexingTypeDescriptor desc = new GridIndexingTypeDescriptor() {
+        IndexingTypeDescriptor desc = new IndexingTypeDescriptor() {
             @Override public String name() {
                 return "StrType";
             }
@@ -46,8 +46,8 @@ public class GridLuceneIndexLoadTest {
                 throw new IllegalStateException();
             }
 
-            @Override public Map<String, GridIndexDescriptor> indexes() {
-                return Collections.<String, GridIndexDescriptor>singletonMap("txt_idx",
new GridIndexDescriptor() {
+            @Override public Map<String, IndexDescriptor> indexes() {
+                return Collections.<String, IndexDescriptor>singletonMap("txt_idx",
new IndexDescriptor() {
                     @Override public Collection<String> fields() {
                         return Collections.emptyList();
                     }
@@ -56,8 +56,8 @@ public class GridLuceneIndexLoadTest {
                         return false;
                     }
 
-                    @Override public GridIndexType type() {
-                        return GridIndexType.FULLTEXT;
+                    @Override public IndexType type() {
+                        return IndexType.FULLTEXT;
                     }
                 });
             }
@@ -75,17 +75,17 @@ public class GridLuceneIndexLoadTest {
             }
         };
 
-        GridLuceneIndex idx = new GridLuceneIndex(new GridIndexingMarshaller() {
-            @Override public <T> GridIndexingEntity<T> unmarshal(byte[] bytes)
throws IgniteSpiException {
+        GridLuceneIndex idx = new GridLuceneIndex(new IndexingMarshaller() {
+            @Override public <T> IndexingEntity<T> unmarshal(byte[] bytes) throws
IgniteSpiException {
                 try {
-                    return new GridIndexingEntityAdapter<>(m.<T>unmarshal(bytes,
null), bytes);
+                    return new IndexingEntityAdapter<>(m.<T>unmarshal(bytes,
null), bytes);
                 }
                 catch (GridException e) {
                     throw new IgniteSpiException(e);
                 }
             }
 
-            @Override public byte[] marshal(GridIndexingEntity<?> entity) throws IgniteSpiException
{
+            @Override public byte[] marshal(IndexingEntity<?> entity) throws IgniteSpiException
{
                 try {
                     return m.marshal(entity.value());
                 }
@@ -104,8 +104,8 @@ public class GridLuceneIndexLoadTest {
         long begin = System.currentTimeMillis();
 
         for (int i = 0, len = 10000000 ; i < len; i++) {
-            idx.store(new GridIndexingEntityAdapter<>(i, null),
-                new GridIndexingEntityAdapter<Object>(sentence(rnd, ws), null),
+            idx.store(new IndexingEntityAdapter<>(i, null),
+                new IndexingEntityAdapter<Object>(sentence(rnd, ws), null),
                 ver, 0L);
 
             if (i % 10000 == 0) {


Mime
View raw message