ignite-454 jdk8 compatibility fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d50065b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d50065b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d50065b1 Branch: refs/heads/ignite-454 Commit: d50065b144cead7cddfdec50e5e3ea6450749300 Parents: c300f6e Author: avinogradov <[email protected]> Authored: Thu Mar 19 13:30:23 2015 +0300 Committer: avinogradov <[email protected]> Committed: Thu Mar 19 13:30:23 2015 +0300 ---------------------------------------------------------------------- examples/pom.xml | 22 ++++-- .../datagrid/CachePopularNumbersExample.java | 20 +++--- .../examples8/datagrid/CacheQueryExample.java | 75 ++++++++++++++------ .../starschema/CacheStarSchemaExample.java | 4 +- .../store/CacheNodeWithStoreStartup.java | 17 ++--- .../MemcacheRestExampleNodeStartup.java | 7 -- .../integration/ClientAbstractSelfTest.java | 4 +- .../rest/RestBinaryProtocolSelfTest.java | 2 +- .../rest/TaskCommandHandlerSelfTest.java | 2 +- ...titionedAtomicSequenceMultiThreadedTest.java | 48 ++++++------- .../DataStreamProcessorSelfTest.java | 2 +- .../lang/GridMetadataAwareAdapterSelfTest.java | 14 ++-- .../OptimizedObjectStreamSelfTest.java | 14 ++-- .../hadoop/v1/HadoopV1ReduceTask.java | 5 +- .../hadoop/v2/HadoopV2ReduceTask.java | 5 +- .../processors/cache/GridCacheSwapSelfTest.java | 2 +- 16 files changed, 144 insertions(+), 99 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 9657dba..3508df9 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,9 +18,9 @@ --> <project - xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -249,11 +249,25 @@ <version>1.9.1</version> <executions> <execution> + <id>add-sources</id> <phase>generate-sources</phase> - <goals><goal>add-source</goal></goals> + <goals> + <goal>add-source</goal> + </goals> <configuration> <sources> <source>src/main/java8</source> + </sources> + </configuration> + </execution> + <execution> + <id>add-tests</id> + <phase>generate-test-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> <source>src/test/java8</source> </sources> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CachePopularNumbersExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CachePopularNumbersExample.java b/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CachePopularNumbersExample.java index 6c37c57..0fadd92 100644 --- a/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CachePopularNumbersExample.java +++ b/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CachePopularNumbersExample.java @@ -18,13 +18,12 @@ package org.apache.ignite.examples8.datagrid; import org.apache.ignite.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import javax.cache.processor.*; import java.util.*; -import static org.apache.ignite.cache.query.Query.*; - /** * Real time popular numbers counter. * <p> @@ -54,7 +53,7 @@ public class CachePopularNumbersExample { * Executes example. * * @param args Command line arguments, none required. - * @throws org.apache.ignite.IgniteException If example execution failed. + * @throws IgniteException If example execution failed. */ public static void main(String[] args) throws IgniteException { Timer popularNumbersQryTimer = new Timer("numbers-query-worker"); @@ -89,7 +88,7 @@ public class CachePopularNumbersExample { * Populates cache in real time with numbers and keeps count for every number. * * @param ignite Ignite. - * @throws org.apache.ignite.IgniteException If failed. + * @throws IgniteException If failed. */ private static void streamData(final Ignite ignite) throws IgniteException { try (IgniteDataStreamer<Integer, Long> stmr = ignite.dataStreamer(CACHE_NAME)) { @@ -119,7 +118,8 @@ public class CachePopularNumbersExample { try { List<List<?>> results = new ArrayList<>(cache.queryFields( - sql("select _key, _val from Long order by _val desc, _key limit ?").setArgs(cnt)).getAll()); + new SqlFieldsQuery("select _key, _val from Long order by _val desc, _key limit ?").setArgs(cnt)) + .getAll()); for (List<?> res : results) System.out.println(res.get(0) + "=" + res.get(1)); @@ -142,12 +142,14 @@ public class CachePopularNumbersExample { */ private static class IncrementingUpdater implements IgniteDataStreamer.Updater<Integer, Long> { /** Process entries to increase value by entry key. */ - private static final EntryProcessor<Integer, Long, Void> INC = (e, args) -> { - Long val = e.getValue(); + private static final EntryProcessor<Integer, Long, Void> INC = new EntryProcessor<Integer, Long, Void>() { + @Override public Void process(MutableEntry<Integer, Long> e, Object... args) { + Long val = e.getValue(); - e.setValue(val == null ? 1L : val + 1); + e.setValue(val == null ? 1L : val + 1); - return null; + return null; + } }; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CacheQueryExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CacheQueryExample.java b/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CacheQueryExample.java index 6c4145a..79b6544 100644 --- a/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CacheQueryExample.java +++ b/examples/src/main/java8/org/apache/ignite/examples8/datagrid/CacheQueryExample.java @@ -96,6 +96,9 @@ public class CacheQueryExample { // Example for TEXT-based querying for a given string in peoples resumes. textQuery(); + // Example for SQL-based querying to calculate average salary among all employees within a company. + sqlQueryWithAggregation(); + // Example for SQL-based fields queries that return only required // fields instead of whole key-value pairs. sqlFieldsQuery(); @@ -109,8 +112,10 @@ public class CacheQueryExample { /** * Example for SQL queries based on salary ranges. + * + * @throws IgniteCheckedException In case of error. */ - private static void sqlQuery() { + private static void sqlQuery() throws IgniteCheckedException { IgniteCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().jcache(CACHE_NAME); // SQL clause which selects salaries based on range. @@ -118,62 +123,85 @@ public class CacheQueryExample { // Execute queries for salary ranges. print("People with salaries between 0 and 1000: ", - cache.query(sql(Person.class, sql).setArgs(0, 1000)).getAll()); + cache.query(new SqlQuery(Person.class, sql).setArgs(0, 1000)).getAll()); print("People with salaries between 1000 and 2000: ", - cache.query(sql(Person.class, sql).setArgs(1000, 2000)).getAll()); + cache.query(new SqlQuery(Person.class, sql).setArgs(1000, 2000)).getAll()); print("People with salaries greater than 2000: ", - cache.query(sql(Person.class, sql).setArgs(2000, Integer.MAX_VALUE)).getAll()); + cache.query(new SqlQuery(Person.class, sql).setArgs(2000, Integer.MAX_VALUE)).getAll()); } /** * Example for SQL queries based on all employees working for a specific organization. + * + * @throws IgniteCheckedException In case of error. */ - private static void sqlQueryWithJoin() { + private static void sqlQueryWithJoin() throws IgniteCheckedException { IgniteCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().jcache(CACHE_NAME); // SQL clause query which joins on 2 types to select people for a specific organization. String joinSql = "from Person, Organization " - + "where Person.orgId = Organization.id " - + "and lower(Organization.name) = lower(?)"; + + "where Person.orgId = Organization.id " + + "and lower(Organization.name) = lower(?)"; // Execute queries for find employees for different organizations. - print("Following people are 'Ignite' employees: ", - cache.query(sql(Person.class, joinSql).setArgs("Ignite")).getAll()); + print("Following people are 'GridGain' employees: ", + cache.query(new SqlQuery(Person.class, joinSql).setArgs("GridGain")).getAll()); print("Following people are 'Other' employees: ", - cache.query(sql(Person.class, joinSql).setArgs("Other")).getAll()); + cache.query(new SqlQuery(Person.class, joinSql).setArgs("Other")).getAll()); } /** * Example for TEXT queries using LUCENE-based indexing of people's resumes. + * + * @throws IgniteCheckedException In case of error. */ - private static void textQuery() { + private static void textQuery() throws IgniteCheckedException { IgniteCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().jcache(CACHE_NAME); // Query for all people with "Master Degree" in their resumes. QueryCursor<Cache.Entry<CacheAffinityKey<UUID>, Person>> masters = - cache.query(text(Person.class, "Master")); + cache.query(new TextQuery(Person.class, "Master")); // Query for all people with "Bachelor Degree" in their resumes. QueryCursor<Cache.Entry<CacheAffinityKey<UUID>, Person>> bachelors = - cache.query(text(Person.class, "Bachelor")); + cache.query(new TextQuery(Person.class, "Bachelor")); print("Following people have 'Master Degree' in their resumes: ", masters.getAll()); print("Following people have 'Bachelor Degree' in their resumes: ", bachelors.getAll()); } /** + * Example for SQL queries to calculate average salary for a specific organization. + * + * @throws IgniteCheckedException In case of error. + */ + private static void sqlQueryWithAggregation() throws IgniteCheckedException { + IgniteCache<CacheAffinityKey<UUID>, Person> cache = Ignition.ignite().jcache(CACHE_NAME); + + // Calculate average of salary of all persons in GridGain. + QueryCursor<List<?>> cursor = cache.queryFields(new SqlFieldsQuery( + "select avg(salary) from Person, Organization where Person.orgId = Organization.id and " + + "lower(Organization.name) = lower(?)").setArgs("GridGain")); + + // Calculate average salary for a specific organization. + print("Average salary for 'GridGain' employees: " + cursor.getAll()); + } + + /** * Example for SQL-based fields queries that return only required * fields instead of whole key-value pairs. + * + * @throws IgniteCheckedException In case of error. */ - private static void sqlFieldsQuery() { + private static void sqlFieldsQuery() throws IgniteCheckedException { IgniteCache<?, ?> cache = Ignition.ignite().jcache(CACHE_NAME); // Create query to get names of all employees. QueryCursor<List<?>> cursor = cache.queryFields( - sql("select concat(firstName, ' ', lastName) from Person")); + new SqlFieldsQuery("select concat(firstName, ' ', lastName) from Person")); // Execute query to get collection of rows. In this particular // case each row will have one element with full name of an employees. @@ -186,14 +214,16 @@ public class CacheQueryExample { /** * Example for SQL-based fields queries that return only required * fields instead of whole key-value pairs. + * + * @throws IgniteCheckedException In case of error. */ - private static void sqlFieldsQueryWithJoin() { + private static void sqlFieldsQueryWithJoin() throws IgniteCheckedException { IgniteCache<?, ?> cache = Ignition.ignite().jcache(CACHE_NAME); // Execute query to get names of all employees. - QueryCursor<List<?>> cursor = cache.queryFields(sql("select concat(firstName, ' ', lastName), " - + "Organization.name from Person, Organization where " - + "Person.orgId = Organization.id")); + QueryCursor<List<?>> cursor = cache.queryFields(new SqlFieldsQuery("select concat(firstName, ' ', lastName), " + + "Organization.name from Person, Organization where " + + "Person.orgId = Organization.id")); // In this particular case each row will have one element with full name of an employees. List<List<?>> res = cursor.getAll(); @@ -204,12 +234,15 @@ public class CacheQueryExample { /** * Populate cache with test data. + * + * @throws IgniteCheckedException In case of error. + * @throws InterruptedException In case of error. */ - private static void initialize() { + private static void initialize() throws IgniteCheckedException, InterruptedException { IgniteCache cache = Ignition.ignite().jcache(CACHE_NAME); // Organizations. - Organization org1 = new Organization("Ignite"); + Organization org1 = new Organization("GridGain"); Organization org2 = new Organization("Other"); // People. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/examples/src/main/java8/org/apache/ignite/examples8/datagrid/starschema/CacheStarSchemaExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java8/org/apache/ignite/examples8/datagrid/starschema/CacheStarSchemaExample.java b/examples/src/main/java8/org/apache/ignite/examples8/datagrid/starschema/CacheStarSchemaExample.java index 9018355..19b3a20 100644 --- a/examples/src/main/java8/org/apache/ignite/examples8/datagrid/starschema/CacheStarSchemaExample.java +++ b/examples/src/main/java8/org/apache/ignite/examples8/datagrid/starschema/CacheStarSchemaExample.java @@ -152,7 +152,7 @@ public class CacheStarSchemaExample { // ======================== // Create cross cache query to get all purchases made at store1. - QueryCursor<Cache.Entry<Integer, FactPurchase>> storePurchases = factCache.query(sql( + QueryCursor<Cache.Entry<Integer, FactPurchase>> storePurchases = factCache.query(new SqlQuery( FactPurchase.class, "from \"replicated\".DimStore, \"partitioned\".FactPurchase " + "where DimStore.id=FactPurchase.storeId and DimStore.name=?").setArgs("Store1")); @@ -182,7 +182,7 @@ public class CacheStarSchemaExample { // Create cross cache query to get all purchases made at store2 // for specified products. - QueryCursor<Cache.Entry<Integer, FactPurchase>> prodPurchases = factCache.query(sql( + QueryCursor<Cache.Entry<Integer, FactPurchase>> prodPurchases = factCache.query(new SqlQuery( FactPurchase.class, "from \"replicated\".DimStore, \"replicated\".DimProduct, \"partitioned\".FactPurchase " + "where DimStore.id=FactPurchase.storeId and DimProduct.id=FactPurchase.productId " http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/examples/src/main/java8/org/apache/ignite/examples8/datagrid/store/CacheNodeWithStoreStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java8/org/apache/ignite/examples8/datagrid/store/CacheNodeWithStoreStartup.java b/examples/src/main/java8/org/apache/ignite/examples8/datagrid/store/CacheNodeWithStoreStartup.java index 01931de..6ca546d 100644 --- a/examples/src/main/java8/org/apache/ignite/examples8/datagrid/store/CacheNodeWithStoreStartup.java +++ b/examples/src/main/java8/org/apache/ignite/examples8/datagrid/store/CacheNodeWithStoreStartup.java @@ -40,16 +40,16 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; * Starts up an empty node with example cache and store configuration. */ public class CacheNodeWithStoreStartup { - /** Use org.apache.ignite.examples8.datagrid.store.dummy.CacheDummyPersonStore to run example. */ + /** Use org.apache.ignite.examples.datagrid.store.dummy.CacheDummyPersonStore to run example. */ public static final String DUMMY = "DUMMY"; - /** Use org.apache.ignite.examples8.datagrid.store.jdbc.CacheJdbcPersonStore to run example. */ + /** Use org.apache.ignite.examples.datagrid.store.jdbc.CacheJdbcPersonStore to run example. */ public static final String SIMPLE_JDBC = "SIMPLE_JDBC"; - /** Use org.apache.ignite.examples8.datagrid.store.hibernate.CacheHibernatePersonStore to run example. */ + /** Use org.apache.ignite.examples.datagrid.store.hibernate.CacheHibernatePersonStore to run example. */ public static final String HIBERNATE = "HIBERNATE"; - /** Use org.apache.ignite.examples8.datagrid.store.jdbc.CacheJdbcPojoPersonStore to run example. */ + /** Use org.apache.ignite.examples.datagrid.store.jdbc.CacheJdbcPojoPersonStore to run example. */ public static final String AUTO = "AUTO"; /** Store to use. */ @@ -59,7 +59,7 @@ public class CacheNodeWithStoreStartup { * Start up an empty node with specified cache configuration. * * @param args Command line arguments, none required. - * @throws org.apache.ignite.IgniteException If example execution failed. + * @throws IgniteException If example execution failed. */ public static void main(String[] args) throws IgniteException { Ignition.start(configure()); @@ -69,7 +69,7 @@ public class CacheNodeWithStoreStartup { * Configure ignite. * * @return Ignite configuration. - * @throws org.apache.ignite.IgniteException If failed. + * @throws IgniteException If failed. */ public static IgniteConfiguration configure() throws IgniteException { IgniteConfiguration cfg = new IgniteConfiguration(); @@ -90,9 +90,6 @@ public class CacheNodeWithStoreStartup { // Set atomicity as transaction, since we are showing transactions in example. cacheCfg.setAtomicityMode(TRANSACTIONAL); - // Set query indexing enabled for use query in example. - cacheCfg.setQueryIndexEnabled(true); - CacheStore<Long, Person> store; switch (STORE) { @@ -133,7 +130,7 @@ public class CacheNodeWithStoreStartup { tm.setDatabaseTable("PERSON"); tm.setKeyType("java.lang.Long"); - tm.setValueType("org.apache.ignite.examples8.datagrid.store.model.Person"); + tm.setValueType("org.apache.ignite.examples.datagrid.store.model.Person"); tm.setKeyFields(F.asList(new CacheTypeFieldMetadata("ID", Types.BIGINT, "id", Long.class))); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/examples/src/main/java8/org/apache/ignite/examples8/misc/client/memcache/MemcacheRestExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java8/org/apache/ignite/examples8/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java8/org/apache/ignite/examples8/misc/client/memcache/MemcacheRestExampleNodeStartup.java index 5565826..69d345e 100644 --- a/examples/src/main/java8/org/apache/ignite/examples8/misc/client/memcache/MemcacheRestExampleNodeStartup.java +++ b/examples/src/main/java8/org/apache/ignite/examples8/misc/client/memcache/MemcacheRestExampleNodeStartup.java @@ -75,13 +75,6 @@ public class MemcacheRestExampleNodeStartup { cacheCfg.setRebalanceMode(SYNC); cacheCfg.setAtomicityMode(TRANSACTIONAL); - CacheQueryConfiguration qryCfg = new CacheQueryConfiguration(); - - qryCfg.setIndexPrimitiveKey(true); - qryCfg.setIndexFixedTyping(false); - - cacheCfg.setQueryConfiguration(qryCfg); - cfg.setCacheConfiguration(cacheCfg); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java index 0173da6..b2d17e7 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java @@ -1068,8 +1068,8 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { GridClientCompute compute = client.compute(); - Assert.assertEquals(17, compute.execute(taskName, taskArg)); - Assert.assertEquals(17, compute.executeAsync(taskName, taskArg).get()); + Assert.assertEquals(new Integer(17), compute.execute(taskName, taskArg)); + Assert.assertEquals(new Integer(17), compute.executeAsync(taskName, taskArg).get()); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java index 20a255f..dac2957 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java @@ -491,7 +491,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { Arrays.asList("executing", 3, "test", 5, "task")); assertTrue(res.isFinished()); - assertEquals(25, res.getResult()); + assertEquals(new Integer(25), res.getResult()); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java index fd0c2c5..83edac4 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java @@ -154,7 +154,7 @@ public class TaskCommandHandlerSelfTest extends GridCommonAbstractTest { GridClientCompute compute = client.compute(); for (int i = 0; i < 1000; i++) - assertEquals("executing".length(), compute.execute(TestTask.class.getName(), "executing")); + assertEquals(new Integer("executing".length()), compute.execute(TestTask.class.getName(), "executing")); GridClientFactory.stop(client.id(), true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java index 806dafa..ceebe79 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java @@ -73,64 +73,64 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends IgniteA assertEquals(4, seq.getAndAdd(3)); assertEquals(9, seq.addAndGet(2)); - assertEquals(9L, U.field(seq, "locVal")); - assertEquals(9L, U.field(seq, "upBound")); + assertEquals(new Long(9L), U.field(seq, "locVal")); + assertEquals(new Long(9L), U.field(seq, "upBound")); // Cache calls. assertEquals(10, seq.incrementAndGet()); - assertEquals(10L, U.field(seq, "locVal")); - assertEquals(19L, U.field(seq, "upBound")); + assertEquals(new Long(10L), U.field(seq, "locVal")); + assertEquals(new Long(19L), U.field(seq, "upBound")); seq.addAndGet(9); - assertEquals(19L, U.field(seq, "locVal")); - assertEquals(19L, U.field(seq, "upBound")); + assertEquals(new Long(19L), U.field(seq, "locVal")); + assertEquals(new Long(19L), U.field(seq, "upBound")); assertEquals(20L, seq.incrementAndGet()); - assertEquals(20L, U.field(seq, "locVal")); - assertEquals(29L, U.field(seq, "upBound")); + assertEquals(new Long(20L), U.field(seq, "locVal")); + assertEquals(new Long(29L), U.field(seq, "upBound")); seq.addAndGet(9); - assertEquals(29L, U.field(seq, "locVal")); - assertEquals(29L, U.field(seq, "upBound")); + assertEquals(new Long(29L), U.field(seq, "locVal")); + assertEquals(new Long(29L), U.field(seq, "upBound")); assertEquals(29, seq.getAndIncrement()); - assertEquals(30L, U.field(seq, "locVal")); - assertEquals(39L, U.field(seq, "upBound")); + assertEquals(new Long(30L), U.field(seq, "locVal")); + assertEquals(new Long(39L), U.field(seq, "upBound")); seq.addAndGet(9); - assertEquals(39L, U.field(seq, "locVal")); - assertEquals(39L, U.field(seq, "upBound")); + assertEquals(new Long(39L), U.field(seq, "locVal")); + assertEquals(new Long(39L), U.field(seq, "upBound")); assertEquals(39L, seq.getAndIncrement()); - assertEquals(40L, U.field(seq, "locVal")); - assertEquals(49L, U.field(seq, "upBound")); + assertEquals(new Long(40L), U.field(seq, "locVal")); + assertEquals(new Long(49L), U.field(seq, "upBound")); seq.addAndGet(9); - assertEquals(49L, U.field(seq, "locVal")); - assertEquals(49L, U.field(seq, "upBound")); + assertEquals(new Long(49L), U.field(seq, "locVal")); + assertEquals(new Long(49L), U.field(seq, "upBound")); assertEquals(50, seq.addAndGet(1)); - assertEquals(50L, U.field(seq, "locVal")); - assertEquals(59L, U.field(seq, "upBound")); + assertEquals(new Long(50L), U.field(seq, "locVal")); + assertEquals(new Long(59L), U.field(seq, "upBound")); seq.addAndGet(9); - assertEquals(59L, U.field(seq, "locVal")); - assertEquals(59L, U.field(seq, "upBound")); + assertEquals(new Long(59L), U.field(seq, "locVal")); + assertEquals(new Long(59L), U.field(seq, "upBound")); assertEquals(59, seq.getAndAdd(1)); - assertEquals(60L, U.field(seq, "locVal")); - assertEquals(69L, U.field(seq, "upBound")); + assertEquals(new Long(60L), U.field(seq, "locVal")); + assertEquals(new Long(69L), U.field(seq, "upBound")); } /** @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java index e6da0d1..54aa209 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java @@ -331,7 +331,7 @@ public class DataStreamProcessorSelfTest extends GridCommonAbstractTest { GridCacheEntryEx entry = cache0.peekEx(key); assertNotNull("Missing entry for key: " + key, entry); - assertEquals((key < 100 ? -1 : key), + assertEquals(new Integer((key < 100 ? -1 : key)), CU.value(entry.rawGetOrUnmarshal(false), cache0.context(), false)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterSelfTest.java index db5ddab..42eebed 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/GridMetadataAwareAdapterSelfTest.java @@ -67,7 +67,7 @@ public class GridMetadataAwareAdapterSelfTest extends GridCommonAbstractTest { // meta(name). assertEquals("val1", ma.meta(attr1)); - assertEquals(1, ma.meta(attr2)); + assertEquals(new Integer(1), ma.meta(attr2)); // allMeta(). Map<UUID, Object> allMeta = ma.allMeta(); @@ -96,8 +96,8 @@ public class GridMetadataAwareAdapterSelfTest extends GridCommonAbstractTest { }) == 5; // removeMeta(name). - assertEquals(3, ma.removeMeta(attr3)); - assertEquals(5, ma.removeMeta(attr4)); + assertEquals(new Integer(3), ma.removeMeta(attr3)); + assertEquals(new Integer(5), ma.removeMeta(attr4)); assert ma.removeMeta(attr156) == null; @@ -109,7 +109,7 @@ public class GridMetadataAwareAdapterSelfTest extends GridCommonAbstractTest { ma.copyMeta(new GridMetadataAwareAdapter(F.<UUID, Object>asMap(k1, "v1", k2, 2))); assertEquals("v1", ma.meta(k1)); - assertEquals(2, ma.meta(k2)); + assertEquals(new Integer(2), ma.meta(k2)); assertEquals("val1", allMeta.get(attr1)); assertEquals(4, allMeta.get(attr2)); @@ -118,10 +118,10 @@ public class GridMetadataAwareAdapterSelfTest extends GridCommonAbstractTest { // copyMeta(from). ma.copyMeta(F.asMap(a1, 1, a2, 2)); - assertEquals(1, ma.meta(a1)); - assertEquals(2, ma.meta(a2)); + assertEquals(new Integer(1), ma.meta(a1)); + assertEquals(new Integer(2), ma.meta(a2)); assertEquals("v1", ma.meta(k1)); - assertEquals(2, ma.meta(k2)); + assertEquals(new Integer(2), ma.meta(k2)); assertEquals("val1", allMeta.get(attr1)); assertEquals(4, allMeta.get(attr2)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java index 5f63730..1b553ce 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java @@ -56,7 +56,7 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest { public void testByte() throws Exception { byte val = 10; - assertEquals(val, marshalUnmarshal(val)); + assertEquals(new Byte(val), marshalUnmarshal(val)); } /** @@ -65,7 +65,7 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest { public void testShort() throws Exception { short val = 100; - assertEquals(val, marshalUnmarshal(val)); + assertEquals(new Short(val), marshalUnmarshal(val)); } /** @@ -74,7 +74,7 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest { public void testInteger() throws Exception { int val = 100; - assertEquals(val, marshalUnmarshal(val)); + assertEquals(new Integer(val), marshalUnmarshal(val)); } /** @@ -83,7 +83,7 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest { public void testLong() throws Exception { long val = 1000L; - assertEquals(val, marshalUnmarshal(val)); + assertEquals(new Long(val), marshalUnmarshal(val)); } /** @@ -110,11 +110,11 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest { public void testBoolean() throws Exception { boolean val = true; - assertEquals(val, marshalUnmarshal(val)); + assertEquals(new Boolean(val), marshalUnmarshal(val)); val = false; - assertEquals(val, marshalUnmarshal(val)); + assertEquals(new Boolean(val), marshalUnmarshal(val)); } /** @@ -123,7 +123,7 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest { public void testChar() throws Exception { char val = 10; - assertEquals(val, marshalUnmarshal(val)); + assertEquals(new Character(val), marshalUnmarshal(val)); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1ReduceTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1ReduceTask.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1ReduceTask.java index 18ee09d..25f707a 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1ReduceTask.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v1/HadoopV1ReduceTask.java @@ -58,7 +58,10 @@ public class HadoopV1ReduceTask extends HadoopV1Task { try { collector = collector(jobConf, ctx, reduce || !job.info().hasReducer(), fileName(), ctx.attemptId()); - Reducer reducer = ReflectionUtils.newInstance(reduce ? jobConf.getReducerClass() : jobConf.getCombinerClass(), + Reducer reducer; + if (reduce) reducer = ReflectionUtils.newInstance(jobConf.getReducerClass(), + jobConf); + else reducer = ReflectionUtils.newInstance(jobConf.getCombinerClass(), jobConf); assert reducer != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2ReduceTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2ReduceTask.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2ReduceTask.java index 250c41b..ffdec8f 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2ReduceTask.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/HadoopV2ReduceTask.java @@ -56,7 +56,10 @@ public class HadoopV2ReduceTask extends HadoopV2Task { try { outputFormat = reduce || !taskCtx.job().info().hasReducer() ? prepareWriter(jobCtx) : null; - Reducer reducer = ReflectionUtils.newInstance(reduce ? jobCtx.getReducerClass() : jobCtx.getCombinerClass(), + Reducer reducer; + if (reduce) reducer = ReflectionUtils.newInstance(jobCtx.getReducerClass(), + jobCtx.getConfiguration()); + else reducer = ReflectionUtils.newInstance(jobCtx.getCombinerClass(), jobCtx.getConfiguration()); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d50065b1/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java index 87c8310..2f793f4 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java @@ -655,7 +655,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { CacheValue val = CU.value(entry.rawGet(), entry.context(), false); assert val != null; - assertEquals(CU.value(entry.key(), entry.context(), false), val.value()); + assertEquals(CU.value(entry.key(), entry.context(), false), new Integer(val.value())); assert entry.version().equals(versions.get(i)); } }
