Apache-Phoenix | Master | Build Successful

2016-02-10 Thread Apache Jenkins Server 
Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/master

Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-master/lastSuccessfulBuild/artifact/

Last Complete Test Report https://builds.apache.org/job/Phoenix-master/lastCompletedBuild/testReport/

Changes
[rajeshbabu] PHOENIX-2665 index split while running group by query is returning

[rajeshbabu] PHOENIX-2334 CSV Bulk load fails on local indexes(Rajeshbabu)



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Apache-Phoenix | 4.x-HBase-1.0 | Build Successful

2016-02-10 Thread Apache Jenkins Server 
4.x-HBase-1.0 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.0

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.0/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.0/lastCompletedBuild/testReport/

Changes
[rajeshbabu] PHOENIX-2665 index split while running group by query is returning

[rajeshbabu] PHOENIX-2334 CSV Bulk load fails on local indexes(Rajeshbabu)



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Apache-Phoenix | 4.x-HBase-0.98 | Build Successful

2016-02-10 Thread Apache Jenkins Server 
4.x-HBase-0.98 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-0.98

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastCompletedBuild/testReport/

Changes
[rajeshbabu] PHOENIX-2665 index split while running group by query is returning

[rajeshbabu] PHOENIX-2334 CSV Bulk load fails on local indexes(Rajeshbabu)



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

phoenix git commit: PHOENIX-2334 CSV Bulk load fails on local indexes(Rajeshbabu)

2016-02-10 Thread rajeshbabu 
Repository: phoenix
Updated Branches:
  refs/heads/master c48fee04e -> decbfe306


PHOENIX-2334 CSV Bulk load fails on local indexes(Rajeshbabu)


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

Branch: refs/heads/master
Commit: decbfe3062bbc970050e03fbb198e61a2d30e88c
Parents: c48fee0
Author: Rajeshbabu Chintaguntla 
Authored: Thu Feb 11 02:48:05 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Thu Feb 11 02:48:05 2016 +0530

--
 .../phoenix/end2end/CsvBulkLoadToolIT.java  | 27 +++-
 .../phoenix/mapreduce/AbstractBulkLoadTool.java | 16 
 .../mapreduce/bulkload/TargetTableRef.java  |  2 +-
 .../phoenix/query/ConnectionQueryServices.java  |  1 +
 .../query/ConnectionQueryServicesImpl.java  | 27 
 .../query/ConnectionlessQueryServicesImpl.java  | 15 +++
 .../query/DelegateConnectionQueryServices.java  |  6 +
 .../java/org/apache/phoenix/util/IndexUtil.java | 10 +++-
 8 files changed, 85 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/decbfe30/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
index 26ec889..96042c5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
@@ -218,7 +218,7 @@ public class CsvBulkLoadToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 Statement stmt = conn.createStatement();
 stmt.execute("CREATE TABLE TABLE6 (ID INTEGER NOT NULL PRIMARY KEY, " +
-"FIRST_NAME VARCHAR, LAST_NAME VARCHAR)");
+"FIRST_NAME VARCHAR, LAST_NAME VARCHAR) SPLIt ON (1,2)");
 String ddl = "CREATE LOCAL INDEX TABLE6_IDX ON TABLE6 "
 + " (FIRST_NAME ASC)";
 stmt.execute(ddl);
@@ -234,16 +234,19 @@ public class CsvBulkLoadToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 CsvBulkLoadTool csvBulkLoadTool = new CsvBulkLoadTool();
 csvBulkLoadTool.setConf(getUtility().getConfiguration());
-try {
-csvBulkLoadTool.run(new String[] {
-"--input", "/tmp/input3.csv",
-"--table", "table6",
-"--zookeeper", zkQuorum});
-fail("Csv bulk load currently has issues with local indexes.");
-} catch( UnsupportedOperationException ise) {
-assertEquals("Local indexes not supported by Bulk 
Loader",ise.getMessage());
-}
-
+int exitCode = csvBulkLoadTool.run(new String[] {
+"--input", "/tmp/input3.csv",
+"--table", "table6",
+"--zookeeper", zkQuorum});
+assertEquals(0, exitCode);
+
+ResultSet rs = stmt.executeQuery("SELECT id, FIRST_NAME FROM TABLE6 
where first_name='FirstName 2'");
+assertTrue(rs.next());
+assertEquals(2, rs.getInt(1));
+assertEquals("FirstName 2", rs.getString(2));
+
+rs.close();
+stmt.close();
 }
 
 @Test
@@ -251,7 +254,7 @@ public class CsvBulkLoadToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 testImportOneIndexTable("TABLE4", false);
 }
 
-//@Test
+@Test
 public void testImportOneLocalIndexTable() throws Exception {
 testImportOneIndexTable("TABLE5", true);
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/decbfe30/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index f6ba5f6..39ee4b1 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -21,8 +21,10 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 
 import org.apache.commons.cli.CommandLine;
@@ -54,6 +56,7 @@ import 
org.apache.phoenix.mapreduce.bulkload.TargetTableRefFunctions;
 import org.apache.phoenix.query.QueryConstants;
 imp

phoenix git commit: PHOENIX-2334 CSV Bulk load fails on local indexes(Rajeshbabu)

2016-02-10 Thread rajeshbabu 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 8425ed9d7 -> 98f3f12be


PHOENIX-2334 CSV Bulk load fails on local indexes(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 98f3f12be0f5e85da02a31d156524a5dc49e7b85
Parents: 8425ed9
Author: Rajeshbabu Chintaguntla 
Authored: Thu Feb 11 02:48:36 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Thu Feb 11 02:48:36 2016 +0530

--
 .../phoenix/end2end/CsvBulkLoadToolIT.java  | 27 +++-
 .../phoenix/mapreduce/AbstractBulkLoadTool.java | 16 
 .../mapreduce/bulkload/TargetTableRef.java  |  2 +-
 .../phoenix/query/ConnectionQueryServices.java  |  1 +
 .../query/ConnectionQueryServicesImpl.java  | 27 
 .../query/ConnectionlessQueryServicesImpl.java  | 15 +++
 .../query/DelegateConnectionQueryServices.java  |  6 +
 .../java/org/apache/phoenix/util/IndexUtil.java | 10 +++-
 8 files changed, 85 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/98f3f12b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
index 26ec889..96042c5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
@@ -218,7 +218,7 @@ public class CsvBulkLoadToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 Statement stmt = conn.createStatement();
 stmt.execute("CREATE TABLE TABLE6 (ID INTEGER NOT NULL PRIMARY KEY, " +
-"FIRST_NAME VARCHAR, LAST_NAME VARCHAR)");
+"FIRST_NAME VARCHAR, LAST_NAME VARCHAR) SPLIt ON (1,2)");
 String ddl = "CREATE LOCAL INDEX TABLE6_IDX ON TABLE6 "
 + " (FIRST_NAME ASC)";
 stmt.execute(ddl);
@@ -234,16 +234,19 @@ public class CsvBulkLoadToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 CsvBulkLoadTool csvBulkLoadTool = new CsvBulkLoadTool();
 csvBulkLoadTool.setConf(getUtility().getConfiguration());
-try {
-csvBulkLoadTool.run(new String[] {
-"--input", "/tmp/input3.csv",
-"--table", "table6",
-"--zookeeper", zkQuorum});
-fail("Csv bulk load currently has issues with local indexes.");
-} catch( UnsupportedOperationException ise) {
-assertEquals("Local indexes not supported by Bulk 
Loader",ise.getMessage());
-}
-
+int exitCode = csvBulkLoadTool.run(new String[] {
+"--input", "/tmp/input3.csv",
+"--table", "table6",
+"--zookeeper", zkQuorum});
+assertEquals(0, exitCode);
+
+ResultSet rs = stmt.executeQuery("SELECT id, FIRST_NAME FROM TABLE6 
where first_name='FirstName 2'");
+assertTrue(rs.next());
+assertEquals(2, rs.getInt(1));
+assertEquals("FirstName 2", rs.getString(2));
+
+rs.close();
+stmt.close();
 }
 
 @Test
@@ -251,7 +254,7 @@ public class CsvBulkLoadToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 testImportOneIndexTable("TABLE4", false);
 }
 
-//@Test
+@Test
 public void testImportOneLocalIndexTable() throws Exception {
 testImportOneIndexTable("TABLE5", true);
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/98f3f12b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index f6ba5f6..39ee4b1 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -21,8 +21,10 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 
 import org.apache.commons.cli.CommandLine;
@@ -54,6 +56,7 @@ import 
org.apache.phoenix.mapreduce.bulkload.TargetTableRefFunctions;
 import org.apache.phoenix.query.QueryC

phoenix git commit: PHOENIX-2334 CSV Bulk load fails on local indexes(Rajeshbabu)

2016-02-10 Thread rajeshbabu 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 7498d7ba0 -> bcacdc128


PHOENIX-2334 CSV Bulk load fails on local indexes(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: bcacdc128ecc45b66f67778e0c99376d0c88c1bf
Parents: 7498d7b
Author: Rajeshbabu Chintaguntla 
Authored: Thu Feb 11 02:47:24 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Thu Feb 11 02:47:24 2016 +0530

--
 .../phoenix/end2end/CsvBulkLoadToolIT.java  | 27 +++-
 .../phoenix/mapreduce/AbstractBulkLoadTool.java | 16 
 .../mapreduce/bulkload/TargetTableRef.java  |  2 +-
 .../phoenix/query/ConnectionQueryServices.java  |  1 +
 .../query/ConnectionQueryServicesImpl.java  | 27 
 .../query/ConnectionlessQueryServicesImpl.java  | 15 +++
 .../query/DelegateConnectionQueryServices.java  |  6 +
 .../java/org/apache/phoenix/util/IndexUtil.java | 10 +++-
 8 files changed, 85 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/bcacdc12/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
index 26ec889..96042c5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
@@ -218,7 +218,7 @@ public class CsvBulkLoadToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 Statement stmt = conn.createStatement();
 stmt.execute("CREATE TABLE TABLE6 (ID INTEGER NOT NULL PRIMARY KEY, " +
-"FIRST_NAME VARCHAR, LAST_NAME VARCHAR)");
+"FIRST_NAME VARCHAR, LAST_NAME VARCHAR) SPLIt ON (1,2)");
 String ddl = "CREATE LOCAL INDEX TABLE6_IDX ON TABLE6 "
 + " (FIRST_NAME ASC)";
 stmt.execute(ddl);
@@ -234,16 +234,19 @@ public class CsvBulkLoadToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 CsvBulkLoadTool csvBulkLoadTool = new CsvBulkLoadTool();
 csvBulkLoadTool.setConf(getUtility().getConfiguration());
-try {
-csvBulkLoadTool.run(new String[] {
-"--input", "/tmp/input3.csv",
-"--table", "table6",
-"--zookeeper", zkQuorum});
-fail("Csv bulk load currently has issues with local indexes.");
-} catch( UnsupportedOperationException ise) {
-assertEquals("Local indexes not supported by Bulk 
Loader",ise.getMessage());
-}
-
+int exitCode = csvBulkLoadTool.run(new String[] {
+"--input", "/tmp/input3.csv",
+"--table", "table6",
+"--zookeeper", zkQuorum});
+assertEquals(0, exitCode);
+
+ResultSet rs = stmt.executeQuery("SELECT id, FIRST_NAME FROM TABLE6 
where first_name='FirstName 2'");
+assertTrue(rs.next());
+assertEquals(2, rs.getInt(1));
+assertEquals("FirstName 2", rs.getString(2));
+
+rs.close();
+stmt.close();
 }
 
 @Test
@@ -251,7 +254,7 @@ public class CsvBulkLoadToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 testImportOneIndexTable("TABLE4", false);
 }
 
-//@Test
+@Test
 public void testImportOneLocalIndexTable() throws Exception {
 testImportOneIndexTable("TABLE5", true);
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/bcacdc12/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index f6ba5f6..39ee4b1 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -21,8 +21,10 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 
 import org.apache.commons.cli.CommandLine;
@@ -54,6 +56,7 @@ import 
org.apache.phoenix.mapreduce.bulkload.TargetTableRefFunctions;
 import org.apache.phoenix.query.Quer

phoenix git commit: PHOENIX-2665 index split while running group by query is returning duplicate results(Rajeshbabu)

2016-02-10 Thread rajeshbabu 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 09b0d823d -> 7498d7ba0


PHOENIX-2665 index split while running group by query is returning duplicate 
results(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 7498d7ba0c74a42054b4f4713ccdb6bcd42eb53d
Parents: 09b0d82
Author: Rajeshbabu Chintaguntla 
Authored: Thu Feb 11 02:41:39 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Thu Feb 11 02:41:39 2016 +0530

--
 .../java/org/apache/phoenix/compile/ScanRanges.java |  2 ++
 .../phoenix/coprocessor/BaseScannerRegionObserver.java  |  4 +++-
 .../org/apache/phoenix/iterate/BaseResultIterators.java | 12 +++-
 3 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7498d7ba/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
index 4d343f3..719970a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
@@ -17,6 +17,7 @@
  */
 package org.apache.phoenix.compile;
 
+import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.SCAN_ACTUAL_START_ROW;
 import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.STARTKEY_OFFSET;
 
 import java.io.IOException;
@@ -384,6 +385,7 @@ public class ScanRanges {
 if (scanStopKey.length > 0 && Bytes.compareTo(scanStartKey, 
scanStopKey) >= 0) { 
 return null; 
 }
+newScan.setAttribute(SCAN_ACTUAL_START_ROW, scanStartKey);
 newScan.setStartRow(scanStartKey);
 newScan.setStopRow(scanStopKey);
 if(keyOffset > 0) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7498d7ba/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
index e5fd75d..d2f3917 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
@@ -96,6 +96,7 @@ abstract public class BaseScannerRegionObserver extends 
BaseRegionObserver {
 public static final String RUN_UPDATE_STATS_ASYNC_ATTRIB = 
"_RunUpdateStatsAsync";
 public static final String SKIP_REGION_BOUNDARY_CHECK = 
"_SKIP_REGION_BOUNDARY_CHECK";
 public static final String TX_SCN = "_TxScn";
+public static final String SCAN_ACTUAL_START_ROW = "_ScanActualStartRow";
 
 /**
  * Attribute name used to pass custom annotations in Scans and Mutations 
(later). Custom annotations
@@ -136,7 +137,8 @@ abstract public class BaseScannerRegionObserver extends 
BaseRegionObserver {
 Bytes.compareTo(upperExclusiveRegionKey, 
expectedUpperRegionKey) != 0;
 } else {
 isStaleRegionBoundaries = Bytes.compareTo(lowerInclusiveScanKey, 
lowerInclusiveRegionKey) < 0 ||
-( Bytes.compareTo(upperExclusiveScanKey, 
upperExclusiveRegionKey) > 0 && upperExclusiveRegionKey.length != 0);
+( Bytes.compareTo(upperExclusiveScanKey, 
upperExclusiveRegionKey) > 0 && upperExclusiveRegionKey.length != 0) ||
+(upperExclusiveRegionKey.length != 0 && 
upperExclusiveScanKey.length == 0);
 }
 if (isStaleRegionBoundaries) {
 Exception cause = new 
StaleRegionBoundaryCacheException(region.getRegionInfo().getTable().getNameAsString());

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7498d7ba/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index b3235e2..3a3d1f2 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -21,6 +21,7 @@ import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObser

phoenix git commit: PHOENIX-2665 index split while running group by query is returning duplicate results(Rajeshbabu)

2016-02-10 Thread rajeshbabu 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 e31ede5cd -> 8425ed9d7


PHOENIX-2665 index split while running group by query is returning duplicate 
results(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 8425ed9d71f8719a26e6a1fde6ed98bbd2709bec
Parents: e31ede5
Author: Rajeshbabu Chintaguntla 
Authored: Thu Feb 11 02:40:53 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Thu Feb 11 02:40:53 2016 +0530

--
 .../java/org/apache/phoenix/compile/ScanRanges.java |  2 ++
 .../phoenix/coprocessor/BaseScannerRegionObserver.java  |  4 +++-
 .../org/apache/phoenix/iterate/BaseResultIterators.java | 12 +++-
 3 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/8425ed9d/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
index 4d343f3..719970a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
@@ -17,6 +17,7 @@
  */
 package org.apache.phoenix.compile;
 
+import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.SCAN_ACTUAL_START_ROW;
 import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.STARTKEY_OFFSET;
 
 import java.io.IOException;
@@ -384,6 +385,7 @@ public class ScanRanges {
 if (scanStopKey.length > 0 && Bytes.compareTo(scanStartKey, 
scanStopKey) >= 0) { 
 return null; 
 }
+newScan.setAttribute(SCAN_ACTUAL_START_ROW, scanStartKey);
 newScan.setStartRow(scanStartKey);
 newScan.setStopRow(scanStopKey);
 if(keyOffset > 0) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/8425ed9d/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
index 6fdae45..1972e4c 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
@@ -96,6 +96,7 @@ abstract public class BaseScannerRegionObserver extends 
BaseRegionObserver {
 public static final String RUN_UPDATE_STATS_ASYNC_ATTRIB = 
"_RunUpdateStatsAsync";
 public static final String SKIP_REGION_BOUNDARY_CHECK = 
"_SKIP_REGION_BOUNDARY_CHECK";
 public static final String TX_SCN = "_TxScn";
+public static final String SCAN_ACTUAL_START_ROW = "_ScanActualStartRow";
 
 /**
  * Attribute name used to pass custom annotations in Scans and Mutations 
(later). Custom annotations
@@ -136,7 +137,8 @@ abstract public class BaseScannerRegionObserver extends 
BaseRegionObserver {
 Bytes.compareTo(upperExclusiveRegionKey, 
expectedUpperRegionKey) != 0;
 } else {
 isStaleRegionBoundaries = Bytes.compareTo(lowerInclusiveScanKey, 
lowerInclusiveRegionKey) < 0 ||
-( Bytes.compareTo(upperExclusiveScanKey, 
upperExclusiveRegionKey) > 0 && upperExclusiveRegionKey.length != 0);
+( Bytes.compareTo(upperExclusiveScanKey, 
upperExclusiveRegionKey) > 0 && upperExclusiveRegionKey.length != 0) ||
+(upperExclusiveRegionKey.length != 0 && 
upperExclusiveScanKey.length == 0);
 }
 if (isStaleRegionBoundaries) {
 Exception cause = new 
StaleRegionBoundaryCacheException(region.getRegionInfo().getTable().getNameAsString());

http://git-wip-us.apache.org/repos/asf/phoenix/blob/8425ed9d/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index b3235e2..3a3d1f2 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -21,6 +21,7 @@ import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserve

phoenix git commit: PHOENIX-2665 index split while running group by query is returning duplicate results(Rajeshbabu)

2016-02-10 Thread rajeshbabu 
Repository: phoenix
Updated Branches:
  refs/heads/master c485a40c7 -> c48fee04e


PHOENIX-2665 index split while running group by query is returning duplicate 
results(Rajeshbabu)


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

Branch: refs/heads/master
Commit: c48fee04e75fc9d08af981f1a2cc257e6cecdbdc
Parents: c485a40
Author: Rajeshbabu Chintaguntla 
Authored: Thu Feb 11 02:38:48 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Thu Feb 11 02:38:48 2016 +0530

--
 .../java/org/apache/phoenix/compile/ScanRanges.java |  2 ++
 .../phoenix/coprocessor/BaseScannerRegionObserver.java  |  4 +++-
 .../org/apache/phoenix/iterate/BaseResultIterators.java | 12 +++-
 3 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c48fee04/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
index 4d343f3..719970a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java
@@ -17,6 +17,7 @@
  */
 package org.apache.phoenix.compile;
 
+import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.SCAN_ACTUAL_START_ROW;
 import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.STARTKEY_OFFSET;
 
 import java.io.IOException;
@@ -384,6 +385,7 @@ public class ScanRanges {
 if (scanStopKey.length > 0 && Bytes.compareTo(scanStartKey, 
scanStopKey) >= 0) { 
 return null; 
 }
+newScan.setAttribute(SCAN_ACTUAL_START_ROW, scanStartKey);
 newScan.setStartRow(scanStartKey);
 newScan.setStopRow(scanStopKey);
 if(keyOffset > 0) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c48fee04/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
index a363459..9487b36 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
@@ -97,6 +97,7 @@ abstract public class BaseScannerRegionObserver extends 
BaseRegionObserver {
 public static final String RUN_UPDATE_STATS_ASYNC_ATTRIB = 
"_RunUpdateStatsAsync";
 public static final String SKIP_REGION_BOUNDARY_CHECK = 
"_SKIP_REGION_BOUNDARY_CHECK";
 public static final String TX_SCN = "_TxScn";
+public static final String SCAN_ACTUAL_START_ROW = "_ScanActualStartRow";
 
 /**
  * Attribute name used to pass custom annotations in Scans and Mutations 
(later). Custom annotations
@@ -137,7 +138,8 @@ abstract public class BaseScannerRegionObserver extends 
BaseRegionObserver {
 Bytes.compareTo(upperExclusiveRegionKey, 
expectedUpperRegionKey) != 0;
 } else {
 isStaleRegionBoundaries = Bytes.compareTo(lowerInclusiveScanKey, 
lowerInclusiveRegionKey) < 0 ||
-( Bytes.compareTo(upperExclusiveScanKey, 
upperExclusiveRegionKey) > 0 && upperExclusiveRegionKey.length != 0);
+( Bytes.compareTo(upperExclusiveScanKey, 
upperExclusiveRegionKey) > 0 && upperExclusiveRegionKey.length != 0) ||
+(upperExclusiveRegionKey.length != 0 && 
upperExclusiveScanKey.length == 0);
 }
 if (isStaleRegionBoundaries) {
 Exception cause = new 
StaleRegionBoundaryCacheException(region.getRegionInfo().getTable().getNameAsString());

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c48fee04/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index b3235e2..3a3d1f2 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -21,6 +21,7 @@ import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.EXPECTED_
 i