Merge pull request #473 from kruthar/jdbc-fields-fix

[jdbc] JDBC module fields fix

jdbc/README.md

@@ -35,11 +35,11 @@ The expected table schema will look similar to the following, syntactical differ
 ```sql
 CREATE TABLE usertable (
 	YCSB_KEY VARCHAR(255) PRIMARY KEY,
-	FIELD1 TEXT, FIELD2 TEXT,
-	FIELD3 TEXT, FIELD4 TEXT,
-	FIELD5 TEXT, FIELD6 TEXT,
-	FIELD7 TEXT, FIELD8 TEXT,
-	FIELD9 TEXT, FIELD10 TEXT
+	FIELD0 TEXT, FIELD1 TEXT,
+	FIELD2 TEXT, FIELD3 TEXT,
+	FIELD4 TEXT, FIELD5 TEXT,
+	FIELD6 TEXT, FIELD7 TEXT,
+	FIELD8 TEXT, FIELD9 TEXT
 );
 ```
 

jdbc/src/main/java/com/yahoo/ycsb/db/JdbcDBClient.java

@@ -283,11 +283,11 @@ public class JdbcDBClient extends DB implements JdbcDBClientConstants {
     StringBuilder update = new StringBuilder("UPDATE ");
     update.append(updateType.tableName);
     update.append(" SET ");
-    for (int i = 1; i <= updateType.numFields; i++) {
+    for (int i = 0; i < updateType.numFields; i++) {
       update.append(COLUMN_PREFIX);
       update.append(i);
       update.append("=?");
-      if (i < updateType.numFields) update.append(", ");
+      if (i < updateType.numFields - 1) update.append(", ");
     }
     update.append(" WHERE ");
     update.append(PRIMARY_KEY);

jdbc/src/main/resources/sql/create_table.mysql

@@ -20,8 +20,8 @@ DROP TABLE IF EXISTS usertable;
 
 -- Create the user table with 5 fields.
 CREATE TABLE usertable(YCSB_KEY VARCHAR (255) PRIMARY KEY,
-  FIELD1 TEXT, FIELD2 TEXT,
-  FIELD3 TEXT, FIELD4 TEXT,
-  FIELD5 TEXT, FIELD6 TEXT,
-  FIELD7 TEXT, FIELD8 TEXT,
-  FIELD9 TEXT, FIELD10 TEXT);
+  FIELD0 TEXT, FIELD1 TEXT,
+  FIELD2 TEXT, FIELD3 TEXT,
+  FIELD4 TEXT, FIELD5 TEXT,
+  FIELD6 TEXT, FIELD7 TEXT,
+  FIELD8 TEXT, FIELD9 TEXT);

jdbc/src/main/resources/sql/create_table.sql

@@ -20,8 +20,8 @@ DROP TABLE IF EXISTS usertable;
 
 -- Create the user table with 5 fields.
 CREATE TABLE usertable(YCSB_KEY VARCHAR PRIMARY KEY,
-  FIELD1 VARCHAR, FIELD2 VARCHAR,
-  FIELD3 VARCHAR, FIELD4 VARCHAR,
-  FIELD5 VARCHAR, FIELD6 VARCHAR,
-  FIELD7 VARCHAR, FIELD8 VARCHAR,
-  FIELD9 VARCHAR, FIELD10 VARCHAR);
+  FIELD0 VARCHAR, FIELD1 VARCHAR,
+  FIELD2 VARCHAR, FIELD3 VARCHAR,
+  FIELD4 VARCHAR, FIELD5 VARCHAR,
+  FIELD6 VARCHAR, FIELD7 VARCHAR,
+  FIELD8 VARCHAR, FIELD9 VARCHAR);