You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/09/20 15:05:15 UTC
[2/2] ignite git commit: IGNITE-3313 Review.
IGNITE-3313 Review.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bcbe8cc4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bcbe8cc4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bcbe8cc4
Branch: refs/heads/master
Commit: bcbe8cc4492449957ff983976f8f16e090c0b239
Parents: f0e4e06
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Sep 20 22:04:30 2016 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Sep 20 22:04:30 2016 +0700
----------------------------------------------------------------------
.../store/cassandra/CassandraCacheStore.java | 6 +++---
.../KeyValuePersistenceSettings.java | 6 ++----
.../persistence/PersistenceController.java | 21 +++++++++++---------
.../session/BatchExecutionAssistant.java | 2 +-
.../cassandra/session/ExecutionAssistant.java | 2 +-
.../tests/persistence/pojo/ignite-config.xml | 1 -
6 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bcbe8cc4/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
index 52ff3c4..6aef0c4 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/CassandraCacheStore.java
@@ -457,12 +457,12 @@ public class CassandraCacheStore<K, V> implements CacheStore<K, V> {
}
/**
- * Returns table name to use for all Cassandra based operations (READ/WRITE/DELETE)
+ * Returns table name to use for all Cassandra based operations (READ/WRITE/DELETE).
*
- * @return table name
+ * @return Table name.
*/
private String cassandraTable() {
return controller.getPersistenceSettings().getTable() != null ?
- controller.getPersistenceSettings().getTable() : storeSes.cacheName().toLowerCase();
+ controller.getPersistenceSettings().getTable() : storeSes.cacheName().toLowerCase();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bcbe8cc4/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/KeyValuePersistenceSettings.java
----------------------------------------------------------------------
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/KeyValuePersistenceSettings.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/KeyValuePersistenceSettings.java
index 243c2b7..cb968b5 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/KeyValuePersistenceSettings.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/persistence/KeyValuePersistenceSettings.java
@@ -272,8 +272,7 @@ public class KeyValuePersistenceSettings implements Serializable {
/**
* Returns DDL statement to create Cassandra table.
*
- * @param table table name
- *
+ * @param table Table name.
* @return Table DDL statement.
*/
public String getTableDDLStatement(String table) {
@@ -316,8 +315,7 @@ public class KeyValuePersistenceSettings implements Serializable {
/**
* Returns DDL statements to create Cassandra table secondary indexes.
*
- * @param table table name
- *
+ * @param table Table name.
* @return DDL statements to create secondary indexes.
*/
public List<String> getIndexDDLStatements(String table) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/bcbe8cc4/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 07e8c24..122f0c8 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
@@ -21,7 +21,12 @@ import com.datastax.driver.core.BoundStatement;
import com.datastax.driver.core.PreparedStatement;
import com.datastax.driver.core.Row;
import java.nio.ByteBuffer;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.store.cassandra.common.PropertyMappingHelper;
@@ -129,8 +134,7 @@ public class PersistenceController {
/**
* Returns CQL statement to insert row into Cassandra table.
*
- * @param table table name
- *
+ * @param table Table name.
* @return CQL statement.
*/
public String getWriteStatement(String table) {
@@ -140,8 +144,7 @@ public class PersistenceController {
/**
* Returns CQL statement to delete row from Cassandra table.
*
- * @param table table name
- *
+ * @param table Table name.
* @return CQL statement.
*/
public String getDeleteStatement(String table) {
@@ -151,15 +154,15 @@ public class PersistenceController {
/**
* Returns CQL statement to select key/value fields from Cassandra table.
*
- * @param table table name
+ * @param table Table name.
* @param includeKeyFields whether to include/exclude key fields from the returned row.
*
* @return CQL statement.
*/
public String getLoadStatement(String table, boolean includeKeyFields) {
return includeKeyFields ?
- getStatement(table, loadWithKeyFieldsStatementTempl, loadWithKeyFieldsStatements) :
- getStatement(table, loadStatementTempl, loadStatements);
+ getStatement(table, loadWithKeyFieldsStatementTempl, loadWithKeyFieldsStatements) :
+ getStatement(table, loadStatementTempl, loadStatements);
}
/**
@@ -247,7 +250,7 @@ public class PersistenceController {
}
String statement = "insert into \"" + persistenceSettings.getKeyspace() + "\".\"%1$s" +
- "\" (" + colsList + ") values (" + questionsList + ")";
+ "\" (" + colsList + ") values (" + questionsList + ")";
if (persistenceSettings.getTTL() != null)
statement += " using ttl " + persistenceSettings.getTTL();
http://git-wip-us.apache.org/repos/asf/ignite/blob/bcbe8cc4/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/BatchExecutionAssistant.java
----------------------------------------------------------------------
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/BatchExecutionAssistant.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/BatchExecutionAssistant.java
index 093e289..5d971e8 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/BatchExecutionAssistant.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/BatchExecutionAssistant.java
@@ -40,7 +40,7 @@ public interface BatchExecutionAssistant<R, V> {
/**
* Cassandra table to use for an operation.
*
- * @return table name
+ * @return Table name.
*/
public String getTable();
http://git-wip-us.apache.org/repos/asf/ignite/blob/bcbe8cc4/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/ExecutionAssistant.java
----------------------------------------------------------------------
diff --git a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/ExecutionAssistant.java b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/ExecutionAssistant.java
index cc625e0..b0dba8b 100644
--- a/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/ExecutionAssistant.java
+++ b/modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/ExecutionAssistant.java
@@ -39,7 +39,7 @@ public interface ExecutionAssistant<R> {
/**
* Cassandra table to use for an operation.
*
- * @return table name
+ * @return Table name.
*/
public String getTable();
http://git-wip-us.apache.org/repos/asf/ignite/blob/bcbe8cc4/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/pojo/ignite-config.xml
----------------------------------------------------------------------
diff --git a/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/pojo/ignite-config.xml b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/pojo/ignite-config.xml
index b734a52..cd23a2a 100644
--- a/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/pojo/ignite-config.xml
+++ b/modules/cassandra/store/src/test/resources/org/apache/ignite/tests/persistence/pojo/ignite-config.xml
@@ -101,7 +101,6 @@
</bean>
</property>
</bean>
-
</list>
</property>