phoenix git commit: PHOENIX-1404 Ignore call to ResultSet#setFetchSize

2014-11-06 Thread greid
Repository: phoenix
Updated Branches:
  refs/heads/master 8401cfdb9 -> caa8826fc


PHOENIX-1404 Ignore call to ResultSet#setFetchSize

Don't throw an exception on calls to ResultSet#setFetchSize,
instead just ignore the call.


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

Branch: refs/heads/master
Commit: caa8826fca17c5f03ebbb8a709925dbc48a98fff
Parents: 8401cfd
Author: Gabriel Reid 
Authored: Thu Nov 6 19:31:39 2014 +0100
Committer: Gabriel Reid 
Committed: Thu Nov 6 19:51:45 2014 +0100

--
 .../apache/phoenix/jdbc/PhoenixResultSet.java   | 23 
 1 file changed, 14 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/caa8826f/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
index 8a6cf64..8c3c863 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
@@ -41,6 +41,8 @@ import java.text.Format;
 import java.util.Calendar;
 import java.util.Map;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.phoenix.compile.ColumnProjector;
 import org.apache.phoenix.compile.RowProjector;
@@ -56,7 +58,7 @@ import org.apache.phoenix.util.SQLCloseable;
 
 
 /**
- * 
+ *
  * JDBC ResultSet implementation of Phoenix.
  * Currently only the following data types are supported:
  * - String
@@ -77,31 +79,34 @@ import org.apache.phoenix.util.SQLCloseable;
  * - ResultSet.CONCUR_READ_ONLY
  * - ResultSet.TYPE_FORWARD_ONLY
  * - ResultSet.CLOSE_CURSORS_AT_COMMIT
- * 
- * 
+ *
+ *
  * @since 0.1
  */
 public class PhoenixResultSet implements ResultSet, SQLCloseable, 
org.apache.phoenix.jdbc.Jdbc7Shim.ResultSet {
+
+private static final Log LOG = LogFactory.getLog(PhoenixResultSet.class);
+
 private final static String STRING_FALSE = "0";
 private final static BigDecimal BIG_DECIMAL_FALSE = BigDecimal.valueOf(0);
 private final static Integer INTEGER_FALSE = Integer.valueOf(0);
 private final static Tuple BEFORE_FIRST = new ResultTuple();
-
+
 private final ResultIterator scanner;
 private final RowProjector rowProjector;
 private final PhoenixStatement statement;
 private final ImmutableBytesWritable ptr = new ImmutableBytesWritable();
-
+
 private Tuple currentRow = BEFORE_FIRST;
 private boolean isClosed = false;
 private boolean wasNull = false;
-
+
 public PhoenixResultSet(ResultIterator resultIterator, RowProjector 
rowProjector, PhoenixStatement statement) throws SQLException {
 this.rowProjector = rowProjector;
 this.scanner = resultIterator;
 this.statement = statement;
 }
-
+
 @Override
 public boolean absolute(int row) throws SQLException {
 throw new SQLFeatureNotSupportedException();
@@ -726,7 +731,7 @@ public class PhoenixResultSet implements ResultSet, 
SQLCloseable, org.apache.pho
 public Tuple getCurrentRow() {
 return currentRow;
 }
-
+
 @Override
 public boolean next() throws SQLException {
 checkOpen();
@@ -782,7 +787,7 @@ public class PhoenixResultSet implements ResultSet, 
SQLCloseable, org.apache.pho
 
 @Override
 public void setFetchSize(int rows) throws SQLException {
-throw new SQLFeatureNotSupportedException();
+LOG.warn("Ignoring setFetchSize(" + rows + ")");
 }
 
 @Override



phoenix git commit: PHOENIX-1404 Ignore call to ResultSet#setFetchSize

2014-11-06 Thread greid
Repository: phoenix
Updated Branches:
  refs/heads/4.2 2b181d325 -> 5b5f5ce72


PHOENIX-1404 Ignore call to ResultSet#setFetchSize

Don't throw an exception on calls to ResultSet#setFetchSize,
instead just ignore the call.


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

Branch: refs/heads/4.2
Commit: 5b5f5ce721ec2663683b3d86be7a16cfcca29590
Parents: 2b181d3
Author: Gabriel Reid 
Authored: Thu Nov 6 19:31:39 2014 +0100
Committer: Gabriel Reid 
Committed: Thu Nov 6 19:55:38 2014 +0100

--
 .../apache/phoenix/jdbc/PhoenixResultSet.java   | 23 
 1 file changed, 14 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b5f5ce7/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
index 8a6cf64..8c3c863 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
@@ -41,6 +41,8 @@ import java.text.Format;
 import java.util.Calendar;
 import java.util.Map;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.phoenix.compile.ColumnProjector;
 import org.apache.phoenix.compile.RowProjector;
@@ -56,7 +58,7 @@ import org.apache.phoenix.util.SQLCloseable;
 
 
 /**
- * 
+ *
  * JDBC ResultSet implementation of Phoenix.
  * Currently only the following data types are supported:
  * - String
@@ -77,31 +79,34 @@ import org.apache.phoenix.util.SQLCloseable;
  * - ResultSet.CONCUR_READ_ONLY
  * - ResultSet.TYPE_FORWARD_ONLY
  * - ResultSet.CLOSE_CURSORS_AT_COMMIT
- * 
- * 
+ *
+ *
  * @since 0.1
  */
 public class PhoenixResultSet implements ResultSet, SQLCloseable, 
org.apache.phoenix.jdbc.Jdbc7Shim.ResultSet {
+
+private static final Log LOG = LogFactory.getLog(PhoenixResultSet.class);
+
 private final static String STRING_FALSE = "0";
 private final static BigDecimal BIG_DECIMAL_FALSE = BigDecimal.valueOf(0);
 private final static Integer INTEGER_FALSE = Integer.valueOf(0);
 private final static Tuple BEFORE_FIRST = new ResultTuple();
-
+
 private final ResultIterator scanner;
 private final RowProjector rowProjector;
 private final PhoenixStatement statement;
 private final ImmutableBytesWritable ptr = new ImmutableBytesWritable();
-
+
 private Tuple currentRow = BEFORE_FIRST;
 private boolean isClosed = false;
 private boolean wasNull = false;
-
+
 public PhoenixResultSet(ResultIterator resultIterator, RowProjector 
rowProjector, PhoenixStatement statement) throws SQLException {
 this.rowProjector = rowProjector;
 this.scanner = resultIterator;
 this.statement = statement;
 }
-
+
 @Override
 public boolean absolute(int row) throws SQLException {
 throw new SQLFeatureNotSupportedException();
@@ -726,7 +731,7 @@ public class PhoenixResultSet implements ResultSet, 
SQLCloseable, org.apache.pho
 public Tuple getCurrentRow() {
 return currentRow;
 }
-
+
 @Override
 public boolean next() throws SQLException {
 checkOpen();
@@ -782,7 +787,7 @@ public class PhoenixResultSet implements ResultSet, 
SQLCloseable, org.apache.pho
 
 @Override
 public void setFetchSize(int rows) throws SQLException {
-throw new SQLFeatureNotSupportedException();
+LOG.warn("Ignoring setFetchSize(" + rows + ")");
 }
 
 @Override



phoenix git commit: PHOENIX-1404 Ignore call to ResultSet#setFetchSize

2014-11-06 Thread greid
Repository: phoenix
Updated Branches:
  refs/heads/4.0 96b1b9128 -> 0813b6c08


PHOENIX-1404 Ignore call to ResultSet#setFetchSize

Don't throw an exception on calls to ResultSet#setFetchSize,
instead just ignore the call.


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

Branch: refs/heads/4.0
Commit: 0813b6c08173f26c0d4726be5ded2d7f03c51c10
Parents: 96b1b91
Author: Gabriel Reid 
Authored: Thu Nov 6 19:31:39 2014 +0100
Committer: Gabriel Reid 
Committed: Thu Nov 6 19:54:31 2014 +0100

--
 .../apache/phoenix/jdbc/PhoenixResultSet.java   | 23 
 1 file changed, 14 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/0813b6c0/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
index 8a6cf64..8c3c863 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
@@ -41,6 +41,8 @@ import java.text.Format;
 import java.util.Calendar;
 import java.util.Map;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.phoenix.compile.ColumnProjector;
 import org.apache.phoenix.compile.RowProjector;
@@ -56,7 +58,7 @@ import org.apache.phoenix.util.SQLCloseable;
 
 
 /**
- * 
+ *
  * JDBC ResultSet implementation of Phoenix.
  * Currently only the following data types are supported:
  * - String
@@ -77,31 +79,34 @@ import org.apache.phoenix.util.SQLCloseable;
  * - ResultSet.CONCUR_READ_ONLY
  * - ResultSet.TYPE_FORWARD_ONLY
  * - ResultSet.CLOSE_CURSORS_AT_COMMIT
- * 
- * 
+ *
+ *
  * @since 0.1
  */
 public class PhoenixResultSet implements ResultSet, SQLCloseable, 
org.apache.phoenix.jdbc.Jdbc7Shim.ResultSet {
+
+private static final Log LOG = LogFactory.getLog(PhoenixResultSet.class);
+
 private final static String STRING_FALSE = "0";
 private final static BigDecimal BIG_DECIMAL_FALSE = BigDecimal.valueOf(0);
 private final static Integer INTEGER_FALSE = Integer.valueOf(0);
 private final static Tuple BEFORE_FIRST = new ResultTuple();
-
+
 private final ResultIterator scanner;
 private final RowProjector rowProjector;
 private final PhoenixStatement statement;
 private final ImmutableBytesWritable ptr = new ImmutableBytesWritable();
-
+
 private Tuple currentRow = BEFORE_FIRST;
 private boolean isClosed = false;
 private boolean wasNull = false;
-
+
 public PhoenixResultSet(ResultIterator resultIterator, RowProjector 
rowProjector, PhoenixStatement statement) throws SQLException {
 this.rowProjector = rowProjector;
 this.scanner = resultIterator;
 this.statement = statement;
 }
-
+
 @Override
 public boolean absolute(int row) throws SQLException {
 throw new SQLFeatureNotSupportedException();
@@ -726,7 +731,7 @@ public class PhoenixResultSet implements ResultSet, 
SQLCloseable, org.apache.pho
 public Tuple getCurrentRow() {
 return currentRow;
 }
-
+
 @Override
 public boolean next() throws SQLException {
 checkOpen();
@@ -782,7 +787,7 @@ public class PhoenixResultSet implements ResultSet, 
SQLCloseable, org.apache.pho
 
 @Override
 public void setFetchSize(int rows) throws SQLException {
-throw new SQLFeatureNotSupportedException();
+LOG.warn("Ignoring setFetchSize(" + rows + ")");
 }
 
 @Override



phoenix git commit: PHOENIX-1404 Ignore call to ResultSet#setFetchSize

2014-11-06 Thread greid
Repository: phoenix
Updated Branches:
  refs/heads/3.2 2a674dd01 -> 2ec907f73


PHOENIX-1404 Ignore call to ResultSet#setFetchSize

Don't throw an exception on calls to ResultSet#setFetchSize,
instead just ignore the call.


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

Branch: refs/heads/3.2
Commit: 2ec907f73d1b98c32c2113121a96ab216f897206
Parents: 2a674dd
Author: Gabriel Reid 
Authored: Thu Nov 6 19:31:39 2014 +0100
Committer: Gabriel Reid 
Committed: Thu Nov 6 19:51:12 2014 +0100

--
 .../apache/phoenix/jdbc/PhoenixResultSet.java   | 23 
 1 file changed, 14 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2ec907f7/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
index 8a6cf64..8c3c863 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
@@ -41,6 +41,8 @@ import java.text.Format;
 import java.util.Calendar;
 import java.util.Map;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.phoenix.compile.ColumnProjector;
 import org.apache.phoenix.compile.RowProjector;
@@ -56,7 +58,7 @@ import org.apache.phoenix.util.SQLCloseable;
 
 
 /**
- * 
+ *
  * JDBC ResultSet implementation of Phoenix.
  * Currently only the following data types are supported:
  * - String
@@ -77,31 +79,34 @@ import org.apache.phoenix.util.SQLCloseable;
  * - ResultSet.CONCUR_READ_ONLY
  * - ResultSet.TYPE_FORWARD_ONLY
  * - ResultSet.CLOSE_CURSORS_AT_COMMIT
- * 
- * 
+ *
+ *
  * @since 0.1
  */
 public class PhoenixResultSet implements ResultSet, SQLCloseable, 
org.apache.phoenix.jdbc.Jdbc7Shim.ResultSet {
+
+private static final Log LOG = LogFactory.getLog(PhoenixResultSet.class);
+
 private final static String STRING_FALSE = "0";
 private final static BigDecimal BIG_DECIMAL_FALSE = BigDecimal.valueOf(0);
 private final static Integer INTEGER_FALSE = Integer.valueOf(0);
 private final static Tuple BEFORE_FIRST = new ResultTuple();
-
+
 private final ResultIterator scanner;
 private final RowProjector rowProjector;
 private final PhoenixStatement statement;
 private final ImmutableBytesWritable ptr = new ImmutableBytesWritable();
-
+
 private Tuple currentRow = BEFORE_FIRST;
 private boolean isClosed = false;
 private boolean wasNull = false;
-
+
 public PhoenixResultSet(ResultIterator resultIterator, RowProjector 
rowProjector, PhoenixStatement statement) throws SQLException {
 this.rowProjector = rowProjector;
 this.scanner = resultIterator;
 this.statement = statement;
 }
-
+
 @Override
 public boolean absolute(int row) throws SQLException {
 throw new SQLFeatureNotSupportedException();
@@ -726,7 +731,7 @@ public class PhoenixResultSet implements ResultSet, 
SQLCloseable, org.apache.pho
 public Tuple getCurrentRow() {
 return currentRow;
 }
-
+
 @Override
 public boolean next() throws SQLException {
 checkOpen();
@@ -782,7 +787,7 @@ public class PhoenixResultSet implements ResultSet, 
SQLCloseable, org.apache.pho
 
 @Override
 public void setFetchSize(int rows) throws SQLException {
-throw new SQLFeatureNotSupportedException();
+LOG.warn("Ignoring setFetchSize(" + rows + ")");
 }
 
 @Override



phoenix git commit: PHOENIX-1404 Ignore call to ResultSet#setFetchSize

2014-11-06 Thread greid
Repository: phoenix
Updated Branches:
  refs/heads/3.0 9ffd8c63a -> d2cd2856b


PHOENIX-1404 Ignore call to ResultSet#setFetchSize

Don't throw an exception on calls to ResultSet#setFetchSize,
instead just ignore the call.


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

Branch: refs/heads/3.0
Commit: d2cd2856bfd41167e27b30d137e07342c2fc2b96
Parents: 9ffd8c6
Author: Gabriel Reid 
Authored: Thu Nov 6 19:31:39 2014 +0100
Committer: Gabriel Reid 
Committed: Thu Nov 6 19:51:04 2014 +0100

--
 .../apache/phoenix/jdbc/PhoenixResultSet.java   | 23 
 1 file changed, 14 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d2cd2856/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
index 8a6cf64..8c3c863 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java
@@ -41,6 +41,8 @@ import java.text.Format;
 import java.util.Calendar;
 import java.util.Map;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.phoenix.compile.ColumnProjector;
 import org.apache.phoenix.compile.RowProjector;
@@ -56,7 +58,7 @@ import org.apache.phoenix.util.SQLCloseable;
 
 
 /**
- * 
+ *
  * JDBC ResultSet implementation of Phoenix.
  * Currently only the following data types are supported:
  * - String
@@ -77,31 +79,34 @@ import org.apache.phoenix.util.SQLCloseable;
  * - ResultSet.CONCUR_READ_ONLY
  * - ResultSet.TYPE_FORWARD_ONLY
  * - ResultSet.CLOSE_CURSORS_AT_COMMIT
- * 
- * 
+ *
+ *
  * @since 0.1
  */
 public class PhoenixResultSet implements ResultSet, SQLCloseable, 
org.apache.phoenix.jdbc.Jdbc7Shim.ResultSet {
+
+private static final Log LOG = LogFactory.getLog(PhoenixResultSet.class);
+
 private final static String STRING_FALSE = "0";
 private final static BigDecimal BIG_DECIMAL_FALSE = BigDecimal.valueOf(0);
 private final static Integer INTEGER_FALSE = Integer.valueOf(0);
 private final static Tuple BEFORE_FIRST = new ResultTuple();
-
+
 private final ResultIterator scanner;
 private final RowProjector rowProjector;
 private final PhoenixStatement statement;
 private final ImmutableBytesWritable ptr = new ImmutableBytesWritable();
-
+
 private Tuple currentRow = BEFORE_FIRST;
 private boolean isClosed = false;
 private boolean wasNull = false;
-
+
 public PhoenixResultSet(ResultIterator resultIterator, RowProjector 
rowProjector, PhoenixStatement statement) throws SQLException {
 this.rowProjector = rowProjector;
 this.scanner = resultIterator;
 this.statement = statement;
 }
-
+
 @Override
 public boolean absolute(int row) throws SQLException {
 throw new SQLFeatureNotSupportedException();
@@ -726,7 +731,7 @@ public class PhoenixResultSet implements ResultSet, 
SQLCloseable, org.apache.pho
 public Tuple getCurrentRow() {
 return currentRow;
 }
-
+
 @Override
 public boolean next() throws SQLException {
 checkOpen();
@@ -782,7 +787,7 @@ public class PhoenixResultSet implements ResultSet, 
SQLCloseable, org.apache.pho
 
 @Override
 public void setFetchSize(int rows) throws SQLException {
-throw new SQLFeatureNotSupportedException();
+LOG.warn("Ignoring setFetchSize(" + rows + ")");
 }
 
 @Override