From d3e1f368c65df38da27103838607bb74fd4dac78 Mon Sep 17 00:00:00 2001
From: Kirill Vlasov <kirill.vlasov@devfactory.com>
Date: Thu, 24 Dec 2015 10:17:01 +0500
Subject: [PATCH] [cassandra cassandra2 dynamodb hbase098 hbase10 jdbc s3]
Fixing squid:S1481 - Unused local variables should be removed
---
.../src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java | 2 +-
.../src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java | 4 ++--
.../src/main/java/com/yahoo/ycsb/db/DynamoDBClient.java | 6 ++----
hbase098/src/main/java/com/yahoo/ycsb/db/HBaseClient.java | 2 +-
hbase10/src/main/java/com/yahoo/ycsb/db/HBaseClient10.java | 4 +---
jdbc/src/test/java/com/yahoo/ycsb/db/JdbcDBClientTest.java | 4 ++--
s3/src/main/java/com/yahoo/ycsb/db/S3Client.java | 3 +--
7 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java b/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java
index 29f9a33f..eeaca7ae 100755
--- a/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java
+++ b/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java
@@ -388,7 +388,7 @@ public class CassandraCQLClient extends DB {
System.out.println(insertStmt.toString());
}
- ResultSet rs = session.execute(insertStmt);
+ session.execute(insertStmt);
return Status.OK;
} catch (Exception e) {
diff --git a/cassandra2/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java b/cassandra2/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java
index 602846e9..6758534f 100644
--- a/cassandra2/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java
+++ b/cassandra2/src/main/java/com/yahoo/ycsb/db/CassandraCQLClient.java
@@ -433,7 +433,7 @@ public class CassandraCQLClient extends DB {
System.out.println(insertStmt.toString());
}
- ResultSet rs = session.execute(insertStmt);
+ session.execute(insertStmt);
return Status.OK;
} catch (Exception e) {
@@ -466,7 +466,7 @@ public class CassandraCQLClient extends DB {
System.out.println(stmt.toString());
}
- ResultSet rs = session.execute(stmt);
+ session.execute(stmt);
return Status.OK;
} catch (Exception e) {
diff --git a/dynamodb/src/main/java/com/yahoo/ycsb/db/DynamoDBClient.java b/dynamodb/src/main/java/com/yahoo/ycsb/db/DynamoDBClient.java
index 8da110d5..8a9a8975 100644
--- a/dynamodb/src/main/java/com/yahoo/ycsb/db/DynamoDBClient.java
+++ b/dynamodb/src/main/java/com/yahoo/ycsb/db/DynamoDBClient.java
@@ -293,9 +293,8 @@ public class DynamoDBClient extends DB {
}
PutItemRequest putItemRequest = new PutItemRequest(table, attributes);
- PutItemResult res = null;
try {
- res = dynamoDB.putItem(putItemRequest);
+ dynamoDB.putItem(putItemRequest);
}catch (AmazonServiceException ex) {
logger.error(ex.getMessage());
return Status.ERROR;
@@ -310,10 +309,9 @@ public class DynamoDBClient extends DB {
public Status delete(String table, String key) {
logger.debug("deletekey: " + key + " from table: " + table);
DeleteItemRequest req = new DeleteItemRequest(table, createPrimaryKey(key));
- DeleteItemResult res = null;
try {
- res = dynamoDB.deleteItem(req);
+ dynamoDB.deleteItem(req);
}catch (AmazonServiceException ex) {
logger.error(ex.getMessage());
return Status.ERROR;
diff --git a/hbase098/src/main/java/com/yahoo/ycsb/db/HBaseClient.java b/hbase098/src/main/java/com/yahoo/ycsb/db/HBaseClient.java
index e469e43a..d0ec137d 100644
--- a/hbase098/src/main/java/com/yahoo/ycsb/db/HBaseClient.java
+++ b/hbase098/src/main/java/com/yahoo/ycsb/db/HBaseClient.java
@@ -110,7 +110,7 @@ public class HBaseClient extends com.yahoo.ycsb.DB
try
{
HTable ht = new HTable(config, table);
- HTableDescriptor dsc = ht.getTableDescriptor();
+ ht.getTableDescriptor();
}
catch (IOException e)
{
diff --git a/hbase10/src/main/java/com/yahoo/ycsb/db/HBaseClient10.java b/hbase10/src/main/java/com/yahoo/ycsb/db/HBaseClient10.java
index 68b4e917..49b699a3 100644
--- a/hbase10/src/main/java/com/yahoo/ycsb/db/HBaseClient10.java
+++ b/hbase10/src/main/java/com/yahoo/ycsb/db/HBaseClient10.java
@@ -28,7 +28,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.BufferedMutator;
import org.apache.hadoop.hbase.client.BufferedMutatorParams;
@@ -142,8 +141,7 @@ public class HBaseClient10 extends com.yahoo.ycsb.DB {
String table = com.yahoo.ycsb.workloads.CoreWorkload.table;
try {
final TableName tName = TableName.valueOf(table);
- HTableDescriptor dsc =
- connection.getTable(tName).getTableDescriptor();
+ connection.getTable(tName).getTableDescriptor();
} catch (IOException e) {
throw new DBException(e);
}
diff --git a/jdbc/src/test/java/com/yahoo/ycsb/db/JdbcDBClientTest.java b/jdbc/src/test/java/com/yahoo/ycsb/db/JdbcDBClientTest.java
index 901c8a66..754ba640 100644
--- a/jdbc/src/test/java/com/yahoo/ycsb/db/JdbcDBClientTest.java
+++ b/jdbc/src/test/java/com/yahoo/ycsb/db/JdbcDBClientTest.java
@@ -153,7 +153,7 @@ public class JdbcDBClientTest {
public void insertTest() {
try {
String insertKey = "user0";
- HashMap<String, ByteIterator> insertMap = insertRow(insertKey);
+ insertRow(insertKey);
ResultSet resultSet = jdbcConnection.prepareStatement(
String.format("SELECT * FROM %s", TABLE_NAME)
@@ -245,7 +245,7 @@ public class JdbcDBClientTest {
@Test
public void readTest() {
String insertKey = "user0";
- HashMap<String, ByteIterator> insertMap = insertRow(insertKey);
+ insertRow(insertKey);
HashSet<String> readFields = new HashSet<String>();
HashMap<String, ByteIterator> readResultMap = new HashMap<String, ByteIterator>();
diff --git a/s3/src/main/java/com/yahoo/ycsb/db/S3Client.java b/s3/src/main/java/com/yahoo/ycsb/db/S3Client.java
index bd18ed51..afc8e216 100644
--- a/s3/src/main/java/com/yahoo/ycsb/db/S3Client.java
+++ b/s3/src/main/java/com/yahoo/ycsb/db/S3Client.java
@@ -361,8 +361,7 @@ public class S3Client extends DB {
getObjectMetadataRequest = new GetObjectMetadataRequest(bucket,
key);
}
- S3Object object =
- s3Client.getObject(getObjectRequest);
+ s3Client.getObject(getObjectRequest);
ObjectMetadata objectMetadata =
s3Client.getObjectMetadata(getObjectMetadataRequest);
int sizeOfFile = (int)objectMetadata.getContentLength();
--
GitLab