IGNITE-3609 Review.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7f35328 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7f35328 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7f35328 Branch: refs/heads/ignite-2788 Commit: e7f353283af2792a2ff0fe8c744b5d2308ece366 Parents: 3b8aca6 Author: Alexey Kuznetsov <[email protected]> Authored: Fri Sep 30 14:51:54 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Sep 30 14:51:54 2016 +0700 ---------------------------------------------------------------------- .../store/cassandra/common/RandomSleeper.java | 2 +- .../persistence/PersistenceController.java | 8 +++++++- .../store/cassandra/persistence/PojoField.java | 10 ++++++---- .../cassandra/persistence/PojoKeyField.java | 10 +++------- .../cassandra/persistence/PojoValueField.java | 19 ++++++------------- .../cassandra/session/CassandraSessionImpl.java | 4 ++-- .../cassandra/session/pool/SessionPool.java | 2 +- .../cassandra/session/transaction/Mutation.java | 1 - .../ignite/tests/CassandraLocalServer.java | 1 + .../apache/ignite/tests/DDLGeneratorTest.java | 5 ++++- .../apache/ignite/tests/load/IntGenerator.java | 2 +- .../apache/ignite/tests/load/LoadTestDriver.java | 14 +++++++------- .../org/apache/ignite/tests/load/Worker.java | 18 +++++++++--------- .../apache/ignite/tests/pojos/ProductOrder.java | 2 +- .../ignite/tests/utils/CacheStoreHelper.java | 6 +++--- .../ignite/tests/utils/TestTransaction.java | 3 +-- 16 files changed, 53 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/RandomSleeper.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/RandomSleeper.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/RandomSleeper.java index 6745a16..f2e57a9 100644 --- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/RandomSleeper.java +++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/common/RandomSleeper.java @@ -43,7 +43,7 @@ public class RandomSleeper { private Random random = new Random(System.currentTimeMillis()); /** */ - private int summary = 0; + private int summary; /** * Creates sleeper instance. http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceController.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceController.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceController.java index 122f0c8..e287a4e 100644 --- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceController.java +++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PersistenceController.java @@ -166,7 +166,7 @@ public class PersistenceController { } /** - * Binds Ignite cache key object to {@link com.datastax.driver.core.PreparedStatement}. + * Binds Ignite cache key object to {@link PreparedStatement}. * * @param statement statement to which key object should be bind. * @param key key object. @@ -347,6 +347,12 @@ public class PersistenceController { return new String[] {hdrWithKeyFields + statement.toString(), hdr + statement.toString()}; } + /** + * @param table Table. + * @param template Template. + * @param statements Statements. + * @return Statement. + */ private String getStatement(final String table, final String template, final Map<String, String> statements) { //noinspection SynchronizationOnLocalVariableOrMethodParameter synchronized (statements) { http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoField.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoField.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoField.java index 78e75a9..99b96d5 100644 --- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoField.java +++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoField.java @@ -21,6 +21,7 @@ import com.datastax.driver.core.DataType; import com.datastax.driver.core.Row; import java.beans.PropertyDescriptor; import java.io.Serializable; +import java.lang.reflect.Method; import org.apache.ignite.IgniteException; import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.cache.store.cassandra.common.PropertyMappingHelper; @@ -85,10 +86,11 @@ public abstract class PojoField implements Serializable { public PojoField(PropertyDescriptor desc) { this.name = desc.getName(); - QuerySqlField sqlField = desc.getReadMethod() != null && - desc.getReadMethod().getAnnotation(QuerySqlField.class) != null ? - desc.getReadMethod().getAnnotation(QuerySqlField.class) : - desc.getWriteMethod() == null ? null : desc.getWriteMethod().getAnnotation(QuerySqlField.class); + Method rdMthd = desc.getReadMethod(); + + QuerySqlField sqlField = rdMthd != null && rdMthd.getAnnotation(QuerySqlField.class) != null + ? rdMthd.getAnnotation(QuerySqlField.class) + : desc.getWriteMethod() == null ? null : desc.getWriteMethod().getAnnotation(QuerySqlField.class); col = sqlField != null && sqlField.name() != null && !sqlField.name().trim().isEmpty() ? sqlField.name() : name.toLowerCase(); http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoKeyField.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoKeyField.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoKeyField.java index 4e86d74..6f42db2 100644 --- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoKeyField.java +++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoKeyField.java @@ -40,7 +40,7 @@ public class PojoKeyField extends PojoField { private static final String SORT_ATTR = "sort"; /** Sort order. */ - private SortOrder sortOrder = null; + private SortOrder sortOrder; /** * Constructs Ignite cache key POJO object descriptor. @@ -79,12 +79,8 @@ public class PojoKeyField extends PojoField { return sortOrder; } - /** - * Initializes descriptor from {@link QuerySqlField} annotation. - * - * @param sqlField {@link QuerySqlField} annotation. - */ - protected void init(QuerySqlField sqlField) { + /** {@inheritDoc} */ + @Override protected void init(QuerySqlField sqlField) { if (sqlField.descending()) sortOrder = SortOrder.DESC; } http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoValueField.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoValueField.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoValueField.java index 3e636c0..fcdd408 100644 --- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoValueField.java +++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/PojoValueField.java @@ -87,16 +87,12 @@ public class PojoValueField extends PojoField { super(desc); } - /** - * Returns DDL for Cassandra columns corresponding to POJO field. - * - * @return columns DDL. - */ - public String getColumnDDL() { + /** {@inheritDoc} */ + @Override public String getColumnDDL() { String colDDL = super.getColumnDDL(); if (isStatic != null && isStatic) - colDDL = colDDL + " static"; + colDDL += " static"; return colDDL; } @@ -140,11 +136,8 @@ public class PojoValueField extends PojoField { return builder.append(";").toString(); } - /** - * Initializes descriptor from {@link QuerySqlField} annotation. - * - * @param sqlField {@link QuerySqlField} annotation. - */ - protected void init(QuerySqlField sqlField) { + /** {@inheritDoc} */ + @Override protected void init(QuerySqlField sqlField) { + // No-op. } } http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java index 4857fa4..ac11686 100644 --- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java +++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java @@ -69,7 +69,7 @@ public class CassandraSessionImpl implements CassandraSession { private volatile Session ses; /** Number of references to Cassandra driver session (for multithreaded environment). */ - private volatile int refCnt = 0; + private volatile int refCnt; /** Storage for the session prepared statements */ private static final Map<String, PreparedStatement> sesStatements = new HashMap<>(); @@ -748,7 +748,7 @@ public class CassandraSessionImpl implements CassandraSession { catch (AlreadyExistsException ignored) { } catch (Throwable e) { - if (!(e instanceof InvalidQueryException) || !e.getMessage().equals("Index already exists")) + if (!(e instanceof InvalidQueryException) || !"Index already exists".equals(e.getMessage())) throw new IgniteException(errorMsg, e); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionPool.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionPool.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionPool.java index fc4a907..95938bd 100644 --- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionPool.java +++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/pool/SessionPool.java @@ -146,7 +146,7 @@ public class SessionPool { synchronized (sessions) { try { - if (sessions.size() == 0) + if (sessions.isEmpty()) return; wrappers = new LinkedList<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/transaction/Mutation.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/transaction/Mutation.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/transaction/Mutation.java index cb014f8..f3fb354 100644 --- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/transaction/Mutation.java +++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/transaction/Mutation.java @@ -57,7 +57,6 @@ public interface Mutation { * Binds prepared statement to current Cassandra session. * * @param statement Statement. - * @param obj Parameters for statement binding. * @return Bounded statement. */ public BoundStatement bindStatement(PreparedStatement statement); http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraLocalServer.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraLocalServer.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraLocalServer.java index fc54e5b..eea4e9e 100644 --- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraLocalServer.java +++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/CassandraLocalServer.java @@ -48,6 +48,7 @@ public class CassandraLocalServer { while (true) { try { System.out.println("Cassandra server running"); + Thread.sleep(10000); } catch (Throwable e) { http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/test/java/org/apache/ignite/tests/DDLGeneratorTest.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/DDLGeneratorTest.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/DDLGeneratorTest.java index 6465580..e982e16 100644 --- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/DDLGeneratorTest.java +++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/DDLGeneratorTest.java @@ -25,6 +25,7 @@ import org.junit.Test; * DDLGenerator test. */ public class DDLGeneratorTest { + /** */ private static final String[] RESOURCES = new String[] { "org/apache/ignite/tests/persistence/primitive/persistence-settings-1.xml", "org/apache/ignite/tests/persistence/pojo/persistence-settings-3.xml", @@ -33,9 +34,11 @@ public class DDLGeneratorTest { "org/apache/ignite/tests/persistence/pojo/order.xml" }; + /** + * Test DDL generator. + */ @Test @SuppressWarnings("unchecked") - /** */ public void generatorTest() { String[] files = new String[RESOURCES.length]; http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/IntGenerator.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/IntGenerator.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/IntGenerator.java index a31abee..21490f6 100644 --- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/IntGenerator.java +++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/IntGenerator.java @@ -26,7 +26,7 @@ public class IntGenerator implements Generator { long val = i / 10000; while (val > Integer.MAX_VALUE) - val = val / 2; + val /= 2; return (int)val; } http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/LoadTestDriver.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/LoadTestDriver.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/LoadTestDriver.java index 296839d..2582007 100644 --- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/LoadTestDriver.java +++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/LoadTestDriver.java @@ -74,7 +74,7 @@ public abstract class LoadTestDriver { } // calculates host unique prefix based on its subnet IP address - long hostUniqePrefix = getHostUniquePrefix(); + long hostUniquePrefix = getHostUniquePrefix(); logger().info("Load tests driver setup successfully completed"); @@ -87,8 +87,8 @@ public abstract class LoadTestDriver { for (int i = 0; i < TestsHelper.getLoadTestsThreadsCount(); i++) { Worker worker = createWorker(clazz, cfg, - hostUniqePrefix + startPosition, - hostUniqePrefix + startPosition + 100000000); + hostUniquePrefix + startPosition, + hostUniquePrefix + startPosition + 100000000); workers.add(worker); worker.setName(testName + "-worker-" + i); worker.start(); @@ -224,14 +224,14 @@ public abstract class LoadTestDriver { long part4 = Long.parseLong(parts[3]); if (part3 < 10) - part3 = part3 * 100; + part3 *= 100; else if (part4 < 100) - part3 = part3 * 10; + part3 *= 10; if (part4 < 10) - part4 = part4 * 100; + part4 *= 100; else if (part4 < 100) - part4 = part4 * 10; + part4 *= 10; return (part4 * 100000000000000L) + (part3 * 100000000000L) + Thread.currentThread().getId(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/Worker.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/Worker.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/Worker.java index f4bffc7..5f3c393 100644 --- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/Worker.java +++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/load/Worker.java @@ -46,31 +46,31 @@ public abstract class Worker extends Thread { boolean warmup = TestsHelper.getLoadTestsWarmupPeriod() != 0; /** */ - private volatile long warmupStartTime = 0; + private volatile long warmupStartTime; /** */ - private volatile long warmupFinishTime = 0; + private volatile long warmupFinishTime; /** */ - private volatile long startTime = 0; + private volatile long startTime; /** */ - private volatile long finishTime = 0; + private volatile long finishTime; /** */ - private volatile long warmupMsgProcessed = 0; + private volatile long warmupMsgProcessed; /** */ - private volatile long warmupSleepCnt = 0; + private volatile long warmupSleepCnt; /** */ - private volatile long msgProcessed = 0; + private volatile long msgProcessed; /** */ - private volatile long msgFailed = 0; + private volatile long msgFailed; /** */ - private volatile long sleepCnt = 0; + private volatile long sleepCnt; /** */ private Throwable executionError; http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/ProductOrder.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/ProductOrder.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/ProductOrder.java index 4baee83..bafc8f3 100644 --- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/ProductOrder.java +++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/pojos/ProductOrder.java @@ -67,7 +67,7 @@ public class ProductOrder { // if user ordered more than 10 items provide 5% discount if (amount > 10) - this.price = this.price * 0.95F; + price *= 0.95F; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CacheStoreHelper.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CacheStoreHelper.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CacheStoreHelper.java index 9bcda6e..ddfa111 100644 --- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CacheStoreHelper.java +++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/CacheStoreHelper.java @@ -41,19 +41,19 @@ public class CacheStoreHelper { /** */ public static CacheStore createCacheStore(String cacheName, Resource persistenceSettings, DataSource conn, - CacheStoreSession session) { + CacheStoreSession session) { return createCacheStore(cacheName, persistenceSettings, conn, session, LOGGER); } /** */ public static CacheStore createCacheStore(String cacheName, Resource persistenceSettings, DataSource conn, - Logger log) { + Logger log) { return createCacheStore(cacheName, persistenceSettings, conn, null, log); } /** */ public static CacheStore createCacheStore(String cacheName, Resource persistenceSettings, DataSource conn, - CacheStoreSession session, Logger log) { + CacheStoreSession session, Logger log) { CassandraCacheStore<Integer, Integer> cacheStore = new CassandraCacheStore<>(conn, new KeyValuePersistenceSettings(persistenceSettings), Runtime.getRuntime().availableProcessors()); http://git-wip-us.apache.org/repos/asf/ignite/blob/e7f35328/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestTransaction.java ---------------------------------------------------------------------- diff --git a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestTransaction.java b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestTransaction.java index cda6715..5f3ec69 100644 --- a/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestTransaction.java +++ b/modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestTransaction.java @@ -36,8 +36,7 @@ public class TestTransaction implements Transaction { private final IgniteUuid xid = IgniteUuid.randomUuid(); /** {@inheritDoc} */ - @Nullable - @Override public IgniteUuid xid() { + @Nullable @Override public IgniteUuid xid() { return xid; }
