phoenix git commit: PHOENIX-2301 NullPointerException when upserting into a char array column

2015-11-15 Thread duminduk
Repository: phoenix
Updated Branches:
  refs/heads/master 016b2b96e -> 7afa91ab9


PHOENIX-2301 NullPointerException when upserting into a char array column


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7afa91ab
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7afa91ab
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7afa91ab

Branch: refs/heads/master
Commit: 7afa91ab97a85b7e33f3a686e4ddff42697f50b2
Parents: 016b2b9
Author: Dumindu Buddhika 
Authored: Sun Nov 15 19:12:27 2015 +0530
Committer: Dumindu Buddhika 
Committed: Sun Nov 15 19:12:27 2015 +0530

--
 .../org/apache/phoenix/end2end/ArrayIT.java | 26 
 .../org/apache/phoenix/schema/PTableImpl.java   |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7afa91ab/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
index b7a2ad2..7400127 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
@@ -2679,4 +2679,30 @@ public class ArrayIT extends BaseClientManagedTimeIT {
 assertEquals(conn.createArrayOf("INTEGER", new Integer[]{5, 6}), 
rs.getArray(4));
 assertEquals(3, rs.getInt(5));
 }
+
+@Test
+public void testCharPrimaryKey() throws SQLException{
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "CREATE TABLE TEST5(testCharArray CHAR(3)[], CONSTRAINT 
test_pk PRIMARY KEY(testCharArray)) DEFAULT_COLUMN_FAMILY='T'";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("UPSERT INTO TEST5 
VALUES (ARRAY['aaa', 'bbb', 'ccc'])");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = DriverManager.getConnection(getUrl(), props);
+ResultSet rs;
+stmt = conn.prepareStatement("SELECT testCharArray from TEST5");
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+assertEquals(conn.createArrayOf("CHAR", new String[]{"aaa", "bbb", 
"ccc"}), rs.getArray(1));
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7afa91ab/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
index b591281..ff4b512 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
@@ -579,7 +579,7 @@ public class PTableImpl implements PTable {
 // once we require tables to have been upgraded
 byteValue = StringUtil.padChar(byteValue, maxLength);
 }
-} else if (maxLength != null && byteValue.length > maxLength) {
+} else if (maxLength != null && !type.isArrayType() && 
byteValue.length > maxLength) {
 throw new DataExceedsCapacityException(name.getString() + 
"." + column.getName().getString() + " may not exceed " + maxLength + " bytes 
(" + SchemaUtil.toString(type, byteValue) + ")");
 }
 os.write(byteValue, 0, byteValue.length);



phoenix git commit: PHOENIX-2301 NullPointerException when upserting into a char array column

2015-11-15 Thread duminduk
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 a2e709642 -> 34f536252


PHOENIX-2301 NullPointerException when upserting into a char array column


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/34f53625
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/34f53625
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/34f53625

Branch: refs/heads/4.x-HBase-0.98
Commit: 34f5362526855b5752f4db153913c866f664f1e3
Parents: a2e7096
Author: Dumindu Buddhika 
Authored: Sun Nov 15 19:40:02 2015 +0530
Committer: Dumindu Buddhika 
Committed: Sun Nov 15 19:40:02 2015 +0530

--
 .../org/apache/phoenix/end2end/ArrayIT.java | 26 
 .../org/apache/phoenix/schema/PTableImpl.java   |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/34f53625/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
index b7a2ad2..7400127 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
@@ -2679,4 +2679,30 @@ public class ArrayIT extends BaseClientManagedTimeIT {
 assertEquals(conn.createArrayOf("INTEGER", new Integer[]{5, 6}), 
rs.getArray(4));
 assertEquals(3, rs.getInt(5));
 }
+
+@Test
+public void testCharPrimaryKey() throws SQLException{
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "CREATE TABLE TEST5(testCharArray CHAR(3)[], CONSTRAINT 
test_pk PRIMARY KEY(testCharArray)) DEFAULT_COLUMN_FAMILY='T'";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("UPSERT INTO TEST5 
VALUES (ARRAY['aaa', 'bbb', 'ccc'])");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = DriverManager.getConnection(getUrl(), props);
+ResultSet rs;
+stmt = conn.prepareStatement("SELECT testCharArray from TEST5");
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+assertEquals(conn.createArrayOf("CHAR", new String[]{"aaa", "bbb", 
"ccc"}), rs.getArray(1));
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/34f53625/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
index 0a7af1a..87e301d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
@@ -579,7 +579,7 @@ public class PTableImpl implements PTable {
 // once we require tables to have been upgraded
 byteValue = StringUtil.padChar(byteValue, maxLength);
 }
-} else if (maxLength != null && byteValue.length > maxLength) {
+} else if (maxLength != null && !type.isArrayType() && 
byteValue.length > maxLength) {
 throw new DataExceedsCapacityException(name.getString() + 
"." + column.getName().getString() + " may not exceed " + maxLength + " bytes 
(" + SchemaUtil.toString(type, byteValue) + ")");
 }
 os.write(byteValue, 0, byteValue.length);



phoenix git commit: PHOENIX-2301 NullPointerException when upserting into a char array column

2015-11-15 Thread duminduk
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 fa17fc42f -> b5940dbf2


PHOENIX-2301 NullPointerException when upserting into a char array column


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b5940dbf
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b5940dbf
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b5940dbf

Branch: refs/heads/4.x-HBase-1.0
Commit: b5940dbf2d0fc7072065901fb17c46139f2cd11d
Parents: fa17fc4
Author: Dumindu Buddhika 
Authored: Sun Nov 15 19:43:59 2015 +0530
Committer: Dumindu Buddhika 
Committed: Sun Nov 15 19:43:59 2015 +0530

--
 .../org/apache/phoenix/end2end/ArrayIT.java | 26 
 .../org/apache/phoenix/schema/PTableImpl.java   |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5940dbf/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
index b7a2ad2..7400127 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArrayIT.java
@@ -2679,4 +2679,30 @@ public class ArrayIT extends BaseClientManagedTimeIT {
 assertEquals(conn.createArrayOf("INTEGER", new Integer[]{5, 6}), 
rs.getArray(4));
 assertEquals(3, rs.getInt(5));
 }
+
+@Test
+public void testCharPrimaryKey() throws SQLException{
+long ts = nextTimestamp();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+String ddl = "CREATE TABLE TEST5(testCharArray CHAR(3)[], CONSTRAINT 
test_pk PRIMARY KEY(testCharArray)) DEFAULT_COLUMN_FAMILY='T'";
+conn.createStatement().execute(ddl);
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 30));
+conn = DriverManager.getConnection(getUrl(), props);
+PreparedStatement stmt = conn.prepareStatement("UPSERT INTO TEST5 
VALUES (ARRAY['aaa', 'bbb', 'ccc'])");
+stmt.execute();
+conn.commit();
+conn.close();
+
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 40));
+conn = DriverManager.getConnection(getUrl(), props);
+ResultSet rs;
+stmt = conn.prepareStatement("SELECT testCharArray from TEST5");
+rs = stmt.executeQuery();
+assertTrue(rs.next());
+assertEquals(conn.createArrayOf("CHAR", new String[]{"aaa", "bbb", 
"ccc"}), rs.getArray(1));
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5940dbf/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
index b591281..ff4b512 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
@@ -579,7 +579,7 @@ public class PTableImpl implements PTable {
 // once we require tables to have been upgraded
 byteValue = StringUtil.padChar(byteValue, maxLength);
 }
-} else if (maxLength != null && byteValue.length > maxLength) {
+} else if (maxLength != null && !type.isArrayType() && 
byteValue.length > maxLength) {
 throw new DataExceedsCapacityException(name.getString() + 
"." + column.getName().getString() + " may not exceed " + maxLength + " bytes 
(" + SchemaUtil.toString(type, byteValue) + ")");
 }
 os.write(byteValue, 0, byteValue.length);



Build failed in Jenkins: Phoenix | Master #960

2015-11-15 Thread Apache Jenkins Server
See 

Changes:

[duminduk] PHOENIX-2301 NullPointerException when upserting into a char array

--
[...truncated 7512 lines...]
---
 T E S T S
---
Running org.apache.phoenix.flume.RegexEventSerializerIT
Running org.apache.phoenix.flume.PhoenixSinkIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.158 sec - in 
org.apache.phoenix.flume.PhoenixSinkIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 41.296 sec - in 
org.apache.phoenix.flume.RegexEventSerializerIT

Results :

Tests run: 15, Failures: 0, Errors: 0, Skipped: 0

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19:integration-test 
(NeedTheirOwnClusterTests) @ phoenix-flume ---

---
 T E S T S
---

Results :

Tests run: 0, Failures: 0, Errors: 0, Skipped: 0

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19:verify (ClientManagedTimeTests) @ 
phoenix-flume ---
[INFO] 
[INFO] --- maven-failsafe-plugin:2.19:verify (HBaseManagedTimeTests) @ 
phoenix-flume ---
[INFO] 
[INFO] --- maven-failsafe-plugin:2.19:verify (NeedTheirOwnClusterTests) @ 
phoenix-flume ---
[INFO] 
[INFO] --- maven-install-plugin:2.5.1:install (default-install) @ phoenix-flume 
---
[INFO] Installing 

 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix-flume/4.7.0-HBase-1.1-SNAPSHOT/phoenix-flume-4.7.0-HBase-1.1-SNAPSHOT.jar
[INFO] Installing 
 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix-flume/4.7.0-HBase-1.1-SNAPSHOT/phoenix-flume-4.7.0-HBase-1.1-SNAPSHOT.pom
[INFO] Installing 

 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix-flume/4.7.0-HBase-1.1-SNAPSHOT/phoenix-flume-4.7.0-HBase-1.1-SNAPSHOT-sources.jar
[INFO] Installing 

 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix-flume/4.7.0-HBase-1.1-SNAPSHOT/phoenix-flume-4.7.0-HBase-1.1-SNAPSHOT-tests.jar
[INFO] 
[INFO] 
[INFO] Building Phoenix - Pig 4.7.0-HBase-1.1-SNAPSHOT
[INFO] 
Downloading: 
https://repository.apache.org/content/repositories/releases/org/apache/hbase/hbase-client/1.1.0/hbase-client-1.1.0-tests.jar
4/172 KB   
8/172 KB   
8/172 KB   
12/172 KB   
14/172 KB   
18/172 KB   
22/172 KB   
22/172 KB   
26/172 KB   
30/172 KB   
34/172 KB   
38/172 KB   
38/172 KB   
42/172 KB   
45/172 KB   
46/172 KB   
47/172 KB   
51/172 KB   
55/172 KB   
55/172 KB   
59/172 KB   
62/172 KB   
63/172 KB   
67/172 KB   
70/172 KB   
71/172 KB   
75/172 KB   
78/172 KB   
79/172 KB   
83/172 KB   
86/172 KB   
87/172 KB   
91/172 KB   
94/172 KB   
95/172 KB   
99/172 KB   
101/172 KB   
103/172 KB   
107/172 KB   
109/172 KB   
111/172 KB   
115/172 KB   
117/172 KB   
119/172 KB   
123/172 KB   
125/172 KB   
127/172 KB   
131/172 KB   
133/172 KB   
135/172 KB   
139/172 KB   
140/172 KB   
143/172 KB   
147/172 KB   
148/172 KB   
151/172 KB   
155/172 KB   
156/172 KB   
159/172 KB   
163/172 KB   
164/172 KB   
167/172 KB   
171/172 KB   
172/172 KB   
172/172 KB   
 
Downloaded: 
https://repository.apache.org/content/repositories/releases/org/apache/hbase/hbase-client/1.1.0/hbase-client-1.1.0-tests.jar
 (172 KB at 716.9 KB/sec)
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ phoenix-pig ---
[INFO] Deleting 

[INFO] 
[INFO] --- maven-checkstyle-plugin:2.13:check (validate) @ phoenix-pig ---
[INFO] 
[INFO] --- build-helper-maven-plugin:1.9.1:add-test-source (add-test-source) @ 
phoenix-pig ---
[INFO] Test Source directory: 
 added.
[INFO] 
[INFO] --- build-helper-maven-plugin:1.9.1:add-test-resource 
(add-test-resource) @ phoenix-pig ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ phoenix-pig ---
[INFO] 
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ 
phoenix-pig ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] 

Build failed in Jenkins: Phoenix-4.x-HBase-1.0 #224

2015-11-15 Thread Apache Jenkins Server
See 

Changes:

[duminduk] PHOENIX-2301 NullPointerException when upserting into a char array

--
[...truncated 1387 lines...]
[INFO] Installing 

 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix-core/4.7.0-HBase-1.0-SNAPSHOT/phoenix-core-4.7.0-HBase-1.0-SNAPSHOT-sources.jar
[INFO] Installing 

 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix-core/4.7.0-HBase-1.0-SNAPSHOT/phoenix-core-4.7.0-HBase-1.0-SNAPSHOT-tests.jar
[INFO] 
[INFO] 
[INFO] Building Phoenix - Flume 4.7.0-HBase-1.0-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ phoenix-flume ---
[INFO] Deleting 

[INFO] 
[INFO] --- maven-checkstyle-plugin:2.13:check (validate) @ phoenix-flume ---
[INFO] 
[INFO] --- build-helper-maven-plugin:1.9.1:add-test-source (add-test-source) @ 
phoenix-flume ---
[INFO] Test Source directory: 

 added.
[INFO] 
[INFO] --- build-helper-maven-plugin:1.9.1:add-test-resource 
(add-test-resource) @ phoenix-flume ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ phoenix-flume 
---
[INFO] 
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ 
phoenix-flume ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ phoenix-flume 
---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 9 source files to 

[WARNING] 
:
 

 uses unchecked or unsafe operations.
[WARNING] 
:
 Recompile with -Xlint:unchecked for details.
[INFO] 
[INFO] --- maven-dependency-plugin:2.1:build-classpath 
(create-mrapp-generated-classpath) @ phoenix-flume ---
[INFO] Wrote classpath file 
'
[INFO] 
[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ 
phoenix-flume ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ 
phoenix-flume ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 4 source files to 

[INFO] 
[INFO] --- maven-surefire-plugin:2.19:test (default-test) @ phoenix-flume ---
[INFO] 
[INFO] --- maven-source-plugin:2.2.1:jar-no-fork (attach-sources) @ 
phoenix-flume ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-jar-plugin:2.4:test-jar (default) @ phoenix-flume ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ phoenix-flume ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-site-plugin:3.2:attach-descriptor (attach-descriptor) @ 
phoenix-flume ---
[INFO] 
[INFO] --- maven-failsafe-plugin:2.19:integration-test (ClientManagedTimeTests) 
@ phoenix-flume ---

---
 T E S T S

Build failed in Jenkins: Phoenix | 4.x-HBase-0.98 #900

2015-11-15 Thread Apache Jenkins Server
See 

Changes:

[duminduk] PHOENIX-2301 NullPointerException when upserting into a char array

--
[...truncated 828 lines...]
[INFO] Installing 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-core/target/phoenix-core-4.7.0-HBase-0.98-SNAPSHOT-sources.jar
 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix-core/4.7.0-HBase-0.98-SNAPSHOT/phoenix-core-4.7.0-HBase-0.98-SNAPSHOT-sources.jar
[INFO] Installing 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-core/target/phoenix-core-4.7.0-HBase-0.98-SNAPSHOT-tests.jar
 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix-core/4.7.0-HBase-0.98-SNAPSHOT/phoenix-core-4.7.0-HBase-0.98-SNAPSHOT-tests.jar
[INFO] 
[INFO] 
[INFO] Building Phoenix - Flume 4.7.0-HBase-0.98-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ phoenix-flume ---
[INFO] Deleting 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/target
[INFO] 
[INFO] --- maven-checkstyle-plugin:2.13:check (validate) @ phoenix-flume ---
[INFO] 
[INFO] --- build-helper-maven-plugin:1.9.1:add-test-source (add-test-source) @ 
phoenix-flume ---
[INFO] Test Source directory: 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/src/it/java
 added.
[INFO] 
[INFO] --- build-helper-maven-plugin:1.9.1:add-test-resource 
(add-test-resource) @ phoenix-flume ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ phoenix-flume 
---
[INFO] 
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ 
phoenix-flume ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/src/main/resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ phoenix-flume 
---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 9 source files to 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/target/classes
[WARNING] 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/src/main/java/org/apache/phoenix/flume/sink/PhoenixSink.java:
 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/src/main/java/org/apache/phoenix/flume/sink/PhoenixSink.java
 uses unchecked or unsafe operations.
[WARNING] 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/src/main/java/org/apache/phoenix/flume/sink/PhoenixSink.java:
 Recompile with -Xlint:unchecked for details.
[INFO] 
[INFO] --- maven-dependency-plugin:2.1:build-classpath 
(create-mrapp-generated-classpath) @ phoenix-flume ---
[INFO] Wrote classpath file 
'/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/target/classes/mrapp-generated-classpath'.
[INFO] 
[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ 
phoenix-flume ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/src/test/resources
[INFO] skip non existing resourceDirectory 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/src/it/resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ 
phoenix-flume ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 4 source files to 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/target/test-classes
[INFO] 
[INFO] --- maven-surefire-plugin:2.19:test (default-test) @ phoenix-flume ---
[INFO] 
[INFO] --- maven-source-plugin:2.2.1:jar-no-fork (attach-sources) @ 
phoenix-flume ---
[INFO] Building jar: 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/target/phoenix-flume-4.7.0-HBase-0.98-SNAPSHOT-sources.jar
[INFO] 
[INFO] --- maven-jar-plugin:2.4:test-jar (default) @ phoenix-flume ---
[INFO] Building jar: 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/target/phoenix-flume-4.7.0-HBase-0.98-SNAPSHOT-tests.jar
[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ phoenix-flume ---
[INFO] Building jar: 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/target/phoenix-flume-4.7.0-HBase-0.98-SNAPSHOT.jar
[INFO] 
[INFO] --- maven-site-plugin:3.2:attach-descriptor (attach-descriptor) @ 
phoenix-flume ---
[INFO] 
[INFO] --- maven-failsafe-plugin:2.19:integration-test (ClientManagedTimeTests) 
@ phoenix-flume ---

---
 T E S T S

phoenix git commit: PHOENIX-2419 Fix flapping Pig tests

2015-11-15 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 34f536252 -> 1e14f4664


PHOENIX-2419 Fix flapping Pig tests


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1e14f466
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1e14f466
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1e14f466

Branch: refs/heads/4.x-HBase-0.98
Commit: 1e14f466424ca110ec82caf950408dc8d5e334c7
Parents: 34f5362
Author: James Taylor 
Authored: Sun Nov 15 18:25:15 2015 -0800
Committer: James Taylor 
Committed: Sun Nov 15 18:26:05 2015 -0800

--
 .../phoenix/pig/PhoenixHBaseLoaderIT.java   | 41 +++
 .../phoenix/pig/PhoenixHBaseStorerIT.java   | 54 +---
 2 files changed, 66 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1e14f466/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
--
diff --git 
a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java 
b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
index 6a5923c..b83ad31 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
@@ -33,12 +33,18 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.Shadower;
+import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.ReadOnlyProps;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.pig.ExecType;
 import org.apache.pig.PigServer;
@@ -50,9 +56,11 @@ import org.apache.pig.impl.logicalLayer.schema.Schema;
 import org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.Maps;
 
 /**
  * 
@@ -71,12 +79,33 @@ public class PhoenixHBaseLoaderIT extends 
BaseHBaseManagedTimeIT {
 private Connection conn;
 private PigServer pigServer;
 
+@BeforeClass
+@Shadower(classBeingShadowed = BaseHBaseManagedTimeIT.class)
+public static void doSetup() throws Exception {
+Map props = Maps.newHashMapWithExpectedSize(3);
+props.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
+// Must update config before starting server
+setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
+}
+
 @Before
 public void setUp() throws Exception {
+Configuration conf = getTestClusterConfig();
+conf.set(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
+pigServer = new PigServer(ExecType.LOCAL, conf);
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 conn = DriverManager.getConnection(getUrl(), props);
-zkQuorum = LOCALHOST + JDBC_PROTOCOL_SEPARATOR + 
getZKClientPort(getTestClusterConfig());
-pigServer = new PigServer(ExecType.LOCAL, getTestClusterConfig());
+zkQuorum = LOCALHOST + JDBC_PROTOCOL_SEPARATOR + getZKClientPort(conf);
+}
+
+@After
+public void tearDown() throws Exception {
+if(conn != null) {
+conn.close();
+}
+if (pigServer != null) {
+pigServer.shutdown();
+}
 }
 
 /**
@@ -717,14 +746,6 @@ public class PhoenixHBaseLoaderIT extends 
BaseHBaseManagedTimeIT {
 assertEquals(expectedList.size(), actualList.size());
}
 
-@After
-public void tearDown() throws Exception {
-if(conn != null) {
-conn.close();
-}
-pigServer.shutdown();
-}
-
 private void dropTable(String tableFullName) throws SQLException {
   Preconditions.checkNotNull(conn);
   conn.createStatement().execute(String.format("DROP TABLE IF EXISTS 
%s",tableFullName));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/1e14f466/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseStorerIT.java
--
diff --git 

Build failed in Jenkins: Phoenix | 4.x-HBase-0.98 #901

2015-11-15 Thread Apache Jenkins Server
See 

Changes:

[jtaylor] PHOENIX-2419 Fix flapping Pig tests

--
[...truncated 828 lines...]
[INFO] Installing 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-core/target/phoenix-core-4.7.0-HBase-0.98-SNAPSHOT-sources.jar
 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix-core/4.7.0-HBase-0.98-SNAPSHOT/phoenix-core-4.7.0-HBase-0.98-SNAPSHOT-sources.jar
[INFO] Installing 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-core/target/phoenix-core-4.7.0-HBase-0.98-SNAPSHOT-tests.jar
 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix-core/4.7.0-HBase-0.98-SNAPSHOT/phoenix-core-4.7.0-HBase-0.98-SNAPSHOT-tests.jar
[INFO] 
[INFO] 
[INFO] Building Phoenix - Flume 4.7.0-HBase-0.98-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ phoenix-flume ---
[INFO] Deleting 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/target
[INFO] 
[INFO] --- maven-checkstyle-plugin:2.13:check (validate) @ phoenix-flume ---
[INFO] 
[INFO] --- build-helper-maven-plugin:1.9.1:add-test-source (add-test-source) @ 
phoenix-flume ---
[INFO] Test Source directory: 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/src/it/java
 added.
[INFO] 
[INFO] --- build-helper-maven-plugin:1.9.1:add-test-resource 
(add-test-resource) @ phoenix-flume ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ phoenix-flume 
---
[INFO] 
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ 
phoenix-flume ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/src/main/resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ phoenix-flume 
---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 9 source files to 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/target/classes
[WARNING] 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/src/main/java/org/apache/phoenix/flume/sink/PhoenixSink.java:
 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/src/main/java/org/apache/phoenix/flume/sink/PhoenixSink.java
 uses unchecked or unsafe operations.
[WARNING] 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/src/main/java/org/apache/phoenix/flume/sink/PhoenixSink.java:
 Recompile with -Xlint:unchecked for details.
[INFO] 
[INFO] --- maven-dependency-plugin:2.1:build-classpath 
(create-mrapp-generated-classpath) @ phoenix-flume ---
[INFO] Wrote classpath file 
'/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/target/classes/mrapp-generated-classpath'.
[INFO] 
[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ 
phoenix-flume ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/src/test/resources
[INFO] skip non existing resourceDirectory 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/src/it/resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ 
phoenix-flume ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 4 source files to 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/target/test-classes
[INFO] 
[INFO] --- maven-surefire-plugin:2.19:test (default-test) @ phoenix-flume ---
[INFO] 
[INFO] --- maven-source-plugin:2.2.1:jar-no-fork (attach-sources) @ 
phoenix-flume ---
[INFO] Building jar: 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/target/phoenix-flume-4.7.0-HBase-0.98-SNAPSHOT-sources.jar
[INFO] 
[INFO] --- maven-jar-plugin:2.4:test-jar (default) @ phoenix-flume ---
[INFO] Building jar: 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/target/phoenix-flume-4.7.0-HBase-0.98-SNAPSHOT-tests.jar
[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ phoenix-flume ---
[INFO] Building jar: 
/x1/jenkins/jenkins-slave/workspace/Phoenix-4.x-HBase-0.98/phoenix-flume/target/phoenix-flume-4.7.0-HBase-0.98-SNAPSHOT.jar
[INFO] 
[INFO] --- maven-site-plugin:3.2:attach-descriptor (attach-descriptor) @ 
phoenix-flume ---
[INFO] 
[INFO] --- maven-failsafe-plugin:2.19:integration-test (ClientManagedTimeTests) 
@ phoenix-flume ---

---
 T E S T S
---

phoenix git commit: PHOENIX-2419 Fix flapping Pig tests

2015-11-15 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 1e14f4664 -> ac62506fb


PHOENIX-2419 Fix flapping Pig tests


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ac62506f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ac62506f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ac62506f

Branch: refs/heads/4.x-HBase-0.98
Commit: ac62506fbc203a351b5a90c45c674b368ebc8ed5
Parents: 1e14f46
Author: James Taylor 
Authored: Sun Nov 15 20:55:18 2015 -0800
Committer: James Taylor 
Committed: Sun Nov 15 20:56:08 2015 -0800

--
 .../java/org/apache/phoenix/pig/BasePigIT.java  | 83 
 .../phoenix/pig/PhoenixHBaseLoaderIT.java   | 54 +
 .../phoenix/pig/PhoenixHBaseStorerIT.java   | 59 +-
 .../phoenix/pig/udf/ReserveNSequenceTestIT.java | 62 +--
 4 files changed, 105 insertions(+), 153 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ac62506f/phoenix-pig/src/it/java/org/apache/phoenix/pig/BasePigIT.java
--
diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/BasePigIT.java 
b/phoenix-pig/src/it/java/org/apache/phoenix/pig/BasePigIT.java
new file mode 100644
index 000..94ccc25
--- /dev/null
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/BasePigIT.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.phoenix.pig;
+
+import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR;
+import static org.apache.phoenix.util.TestUtil.LOCALHOST;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.Shadower;
+import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.ReadOnlyProps;
+import org.apache.pig.ExecType;
+import org.apache.pig.PigServer;
+import org.apache.pig.data.TupleFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
+import com.google.common.collect.Maps;
+
+public class BasePigIT extends BaseHBaseManagedTimeIT {
+protected TupleFactory tupleFactory;
+protected String zkQuorum;
+protected Connection conn;
+protected Configuration conf;
+protected PigServer pigServer;
+
+@BeforeClass
+@Shadower(classBeingShadowed = BaseHBaseManagedTimeIT.class)
+public static void doSetup() throws Exception {
+Map props = Maps.newHashMapWithExpectedSize(3);
+props.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
+// Must update config before starting server
+setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
+}
+
+@Before
+public void setUp() throws Exception {
+conf = getTestClusterConfig();
+conf.set(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
+pigServer = new PigServer(ExecType.LOCAL, conf);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+conn = DriverManager.getConnection(getUrl(), props);
+zkQuorum = LOCALHOST + JDBC_PROTOCOL_SEPARATOR + getZKClientPort(conf);
+tupleFactory = TupleFactory.getInstance();
+}
+
+@After
+public void tearDown() throws Exception {
+if(conn != null) {
+conn.close();
+}
+if (pigServer != null) {
+pigServer.shutdown();
+}
+}
+
+
+}

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ac62506f/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java

phoenix git commit: PHOENIX-2419 Fix flapping Pig tests

2015-11-15 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 ac62506fb -> 10d1b64e2


PHOENIX-2419 Fix flapping Pig tests


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/10d1b64e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/10d1b64e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/10d1b64e

Branch: refs/heads/4.x-HBase-0.98
Commit: 10d1b64e2dd05db50211948fa62fa95f7b4e7613
Parents: ac62506
Author: James Taylor 
Authored: Sun Nov 15 23:28:09 2015 -0800
Committer: James Taylor 
Committed: Sun Nov 15 23:28:09 2015 -0800

--
 .../phoenix/pig/PhoenixHBaseLoaderIT.java   | 391 +--
 1 file changed, 183 insertions(+), 208 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/10d1b64e/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
--
diff --git 
a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java 
b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
index bc614bf..accf453 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -40,14 +39,12 @@ import org.apache.pig.impl.logicalLayer.schema.Schema;
 import org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema;
 import org.junit.Test;
 
-import com.google.common.base.Preconditions;
-
 /**
  * 
  * Test class to run all the integration tests against a virtual map reduce 
cluster.
  */
 public class PhoenixHBaseLoaderIT extends BasePigIT {
-
+
 private static final Log LOG = 
LogFactory.getLog(PhoenixHBaseLoaderIT.class);
 private static final String SCHEMA_NAME = "T";
 private static final String TABLE_NAME = "A";
@@ -71,7 +68,7 @@ public class PhoenixHBaseLoaderIT extends BasePigIT {
 pigServer.registerQuery(String.format(
 "A = load 'hbase://table/%s' using " + 
PhoenixHBaseLoader.class.getName() + "('%s');", TABLE,
 zkQuorum));
-
+
 final Schema schema = pigServer.dumpSchema("A");
 List fields = schema.getFields();
 assertEquals(4, fields.size());
@@ -91,18 +88,18 @@ public class PhoenixHBaseLoaderIT extends BasePigIT {
  */
 @Test
 public void testSchemaForTableWithSpecificColumns() throws Exception {
-
+
 //create the table
 final String TABLE = "TABLE2";
 final String ddl = "CREATE TABLE " + TABLE
 + "  (ID INTEGER NOT NULL PRIMARY KEY,NAME VARCHAR, AGE 
INTEGER) ";
 conn.createStatement().execute(ddl);
-
+
 final String selectColumns = "ID,NAME";
 pigServer.registerQuery(String.format(
 "A = load 'hbase://table/%s/%s' using " + 
PhoenixHBaseLoader.class.getName() + "('%s');",
 TABLE, selectColumns, zkQuorum));
-
+
 Schema schema = pigServer.dumpSchema("A");
 List fields = schema.getFields();
 assertEquals(2, fields.size());
@@ -111,29 +108,29 @@ public class PhoenixHBaseLoaderIT extends BasePigIT {
 assertTrue(fields.get(1).alias.equalsIgnoreCase("NAME"));
 assertTrue(fields.get(1).type == DataType.CHARARRAY);
 }
-
+
 /**
  * Validates the schema returned when a SQL SELECT query is given as part 
of LOAD .
  * @throws Exception
  */
 @Test
 public void testSchemaForQuery() throws Exception {
-
-   //create the table.
+
+//create the table.
 final String TABLE = "TABLE3";
 String ddl = String.format("CREATE TABLE " + TABLE +
- "  (A_STRING VARCHAR NOT NULL, A_DECIMAL DECIMAL NOT NULL, 
CF1.A_INTEGER INTEGER, CF2.A_DOUBLE DOUBLE"
+"  (A_STRING VARCHAR NOT NULL, A_DECIMAL DECIMAL NOT NULL, 
CF1.A_INTEGER INTEGER, CF2.A_DOUBLE DOUBLE"
 + "  CONSTRAINT pk PRIMARY KEY (A_STRING, A_DECIMAL))\n", 
TABLE);
 conn.createStatement().execute(ddl);
 
-
-
+
+
 //sql query for LOAD
 final String sqlQuery = "SELECT A_STRING,CF1.A_INTEGER,CF2.A_DOUBLE 
FROM " + TABLE;
 pigServer.registerQuery(String.format(
 "A = load 'hbase://query/%s' using " + 
PhoenixHBaseLoader.class.getName() + "('%s');",
 sqlQuery, zkQuorum));
-
+
 //assert the schema.
 Schema schema = pigServer.dumpSchema("A");
 List