svn commit: r1617667 - in /phoenix: phoenix-docs/src/main/org/h2/ phoenix-docs/src/main/org/h2/jdbc/ phoenix-docs/src/main/org/h2/jdbcx/ phoenix-docs/src/main/org/h2/tools/ site/publish/ site/source/s
Author: jamestaylor
Date: Wed Aug 13 06:35:42 2014
New Revision: 1617667
URL: http://svn.apache.org/r1617667
Log:
Update secondary index docs
Modified:
phoenix/phoenix-docs/src/main/org/h2/Driver.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcResultSet.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcStatement.java
phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcConnectionPool.java
phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcDataSource.java
phoenix/phoenix-docs/src/main/org/h2/tools/SimpleResultSet.java
phoenix/site/publish/secondary_indexing.html
phoenix/site/source/src/site/markdown/secondary_indexing.md
Modified: phoenix/phoenix-docs/src/main/org/h2/Driver.java
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/Driver.java?rev=1617667&r1=1617666&r2=1617667&view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/Driver.java (original)
+++ phoenix/phoenix-docs/src/main/org/h2/Driver.java Wed Aug 13 06:35:42 2014
@@ -17,7 +17,7 @@ import org.h2.message.DbException;
import org.h2.message.TraceSystem;
import org.h2.upgrade.DbUpgrade;
-//## Java 1.7 ##
+/*## Java 1.7 ##
import java.util.logging.Logger;
//*/
@@ -138,7 +138,7 @@ public class Driver implements java.sql.
/**
* [Not supported]
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public Logger getParentLogger() {
return null;
}
Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java?rev=1617667&r1=1617666&r2=1617667&view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java
(original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java Wed
Aug 13 06:35:42 2014
@@ -1440,7 +1440,7 @@ public class JdbcCallableStatement exten
* @param parameterIndex the parameter index (1, 2, ...)
* @param type the class of the returned value
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public T getObject(int parameterIndex, Class type) {
return null;
}
@@ -1452,7 +1452,7 @@ public class JdbcCallableStatement exten
* @param parameterName the parameter name
* @param type the class of the returned value
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public T getObject(String parameterName, Class type) {
return null;
}
Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java?rev=1617667&r1=1617666&r2=1617667&view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java (original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java Wed Aug 13
06:35:42 2014
@@ -49,7 +49,7 @@ import java.sql.SQLXML;
import java.sql.SQLClientInfoException;
//*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
import java.util.concurrent.Executor;
//*/
@@ -1678,7 +1678,7 @@ public class JdbcConnection extends Trac
*
* @param schema the schema
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public void setSchema(String schema) {
// not supported
}
@@ -1687,7 +1687,7 @@ public class JdbcConnection extends Trac
/**
* [Not supported]
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public String getSchema() {
return null;
}
@@ -1698,7 +1698,7 @@ public class JdbcConnection extends Trac
*
* @param executor the executor used by this method
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public void abort(Executor executor) {
// not supported
}
@@ -1710,7 +1710,7 @@ public class JdbcConnection extends Trac
* @param executor the executor used by this method
* @param milliseconds the TCP connection timeout
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public void setNetworkTimeout(Executor executor, int milliseconds) {
// not supported
}
@@ -1719,7 +1719,7 @@ public class JdbcConnection extends Trac
/**
* [Not supported]
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public int getNetworkTimeout() {
return 0;
}
Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java?rev=1617667&r1=1617666&r2=1617667&view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMeta
svn commit: r6151 - in /dev/phoenix/phoenix-3.1.0-rc1: ./ bin/ src/
Author: mujtaba Date: Tue Aug 12 21:53:56 2014 New Revision: 6151 Log: Phoenix 3.1-rc1 Added: dev/phoenix/phoenix-3.1.0-rc1/ dev/phoenix/phoenix-3.1.0-rc1/bin/ dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz (with props) dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz.asc dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz.md5 dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz.sha dev/phoenix/phoenix-3.1.0-rc1/src/ dev/phoenix/phoenix-3.1.0-rc1/src/phoenix-3.1.0-src.tar.gz (with props) dev/phoenix/phoenix-3.1.0-rc1/src/phoenix-3.1.0-src.tar.gz.asc dev/phoenix/phoenix-3.1.0-rc1/src/phoenix-3.1.0-src.tar.gz.md5 dev/phoenix/phoenix-3.1.0-rc1/src/phoenix-3.1.0-src.tar.gz.sha Added: dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz.asc == --- dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz.asc (added) +++ dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz.asc Tue Aug 12 21:53:56 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.10 (GNU/Linux) + +iQIcBAABCgAGBQJT6owiAAoJEC1+sLgXr24/OicP/jS15gJVcIEVta00Y3yUtzxp +wTW5+SwajunhJY9jVbNIkqoptmFioIuedgGooLwgxTjFlXmwCAD8sS/hdPOTvycM +c9WqbV1+8DZWMf/nJpeix3U7pGwpnxzCOxPMCoAAyM5wxUbWxNrGhfm+RhJ9S+HB +ebjhHthyqdAxsHjWZGYqcgDmMpEyrfMor+ChQ2stmiXPiEVxMqNNQvtMijvRVhLK +JBzX4mg6n5IJv0CoO7/bvLS9khaH0/u/laPZOYGcRLRqVEi/C7GefrX7svrtSynB +blzJ2fvw7hA6C/Ndw71EQJcGuBGpVREx+Wkx4CLCPpd0jMUWpnjs4sEM4mspAnma +QPECLfOpRHvVSaezWcFMzKkvc+IRPfIbVP1FSt6l4+MwY+NuzfEoqrMRuqQwz94m +SzX0zdZTsF8+tqodCWUuHvv19t3JI0uhe02nRf6OG2J0ENIV6txYP683pQHYIrXR +zbP7DOV/48Sf7tWNK+CoGh5xtloEjaJcOxowjGEPjiEgfYNgy4gIPwR7O1agJMAy +g7rHW+9RTkt3ocIXxCd47xyAfa2ugwKwtqBgHv/WuMbU2Fhf/84KPdd18atfQXGF +2iRZwG3oDozDNeNNIYIwR6LYMQgoZB5dle5U8q8tS59tzVDmceBTvtWeKJp3HsQV +hwRuKvzL4dXfly9aIAUv +=LuZW +-END PGP SIGNATURE- Added: dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz.md5 == --- dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz.md5 (added) +++ dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz.md5 Tue Aug 12 21:53:56 2014 @@ -0,0 +1 @@ +9e5d64e841c623723d07228c48df3bd5 *phoenix-3.1.0-bin.tar.gz Added: dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz.sha == --- dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz.sha (added) +++ dev/phoenix/phoenix-3.1.0-rc1/bin/phoenix-3.1.0-bin.tar.gz.sha Tue Aug 12 21:53:56 2014 @@ -0,0 +1,2 @@ +9a481b7bebcf8dec8bc13a63093d3beb61499f536fbacfd19d66d9563c8227a7691a13b9b36e62e98d90b35e29687f6067108c21f1d1532669ac25e7f9b38d03 *phoenix-3.1.0-bin.tar.gz +a5bed52860884163f5885b9651f9023c197fcb164998083bd4f2d07ac59af19b *phoenix-3.1.0-bin.tar.gz Added: dev/phoenix/phoenix-3.1.0-rc1/src/phoenix-3.1.0-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/phoenix-3.1.0-rc1/src/phoenix-3.1.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/phoenix-3.1.0-rc1/src/phoenix-3.1.0-src.tar.gz.asc == --- dev/phoenix/phoenix-3.1.0-rc1/src/phoenix-3.1.0-src.tar.gz.asc (added) +++ dev/phoenix/phoenix-3.1.0-rc1/src/phoenix-3.1.0-src.tar.gz.asc Tue Aug 12 21:53:56 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.10 (GNU/Linux) + +iQIcBAABCgAGBQJT6ow2AAoJEC1+sLgXr24/F+0QAJi6gPN5wA05wnKB7I9Vr6D1 +p81pe/yg9diUtfc447iZhix3BIo6+jGurRF6y7o3FDFef+ENU3WgLb99RvekGt/M +Sn7Mt1qa1qdyyEtgYjTWvevM21NeW+mrNCnKN5LWuwufOdaA6eJikRCSOpK3zIGe +3yuNckhO0GSwhuypsJwebEsVMEXGPy2Ax3QumUpmR38BwGQkNDVYPksYCY1frwHA +K5O1xZidpSWrKNSC90ZGHzjYxeXOkxlRtKEYZuz6PdB5zDfh9doaCT5FjxHnvwlh +6VJxox9WQ13F6xbSPvRVktop89PKLXR1r+ReHoKZpB4QX4Rlobq68kxaGEZhkma1 +Lfm3ia6aSJzYZmACR7qwZpMY9TTtYH9ZSt7041ecCzUnwbQgLFkk6phrJL9AtVFl +5nliJhT8jceUi1rq4qMtWGLmeDOyCYvoPtNaAmdX0v7wsIuCabWL+EoBUgyAiXqX +ZDG+GXMnYkrs5Ah8O6UD+WxlhWvVEpQlzxECZudgtZ8fBTBPQKD5LCfb4RQMEM6+ +ePtKDv/H/ntKW2i5Jf/sMJxWSjZ5ylLBQAGKhWU+dCywnnaHCUFQvvxquRgHXthf +pUByd+nUUARqhQwpvT8cDZJpVKOv8o7vHPAqWFsc9YVz4sVl5ZcNSAd/izTk0GHw +A2T8eRoDx1akmBTwSd0O +=PkHs +-END PGP SIGNATURE- Added: dev/phoenix/phoenix-3.1.0-rc1/src/phoenix-3.1.0-src.tar.gz.md5 ===
Git Push Summary
Repository: phoenix Updated Tags: refs/tags/v3.1.0-rc1 [created] de8448894
Apache-Phoenix | Master | Hadoop1 | Build Successful
Master branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-master-hadoop1/lastSuccessfulBuild/artifact/ Last Complete Test Report https://builds.apache.org/job/Phoenix-master-hadoop1/lastCompletedBuild/testReport/ Changes [jtaylor] PHOENIX-1162 Use physical name instead of logical name when recovering from stale region cache [mujtaba] Phoenix-1132 - Create merged jar for server side. Adding antlr.*
Apache-Phoenix | 4.0 | Hadoop1 | Build Successful
4.0 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git Compiled Artifacts https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastCompletedBuild/testReport/ Changes [jtaylor] PHOENIX-1162 Use physical name instead of logical name when recovering from stale region cache [mujtaba] Phoenix-1132 - Create merged jar for server side. Adding antlr.*
Apache-Phoenix | 3.0 | Hadoop1 | Build Successful
3.0 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastSuccessfulBuild/artifact/ Last Complete Test Report https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastCompletedBuild/testReport/ Changes [jtaylor] PHOENIX-1162 Use physical name instead of logical name when recovering from stale region cache
git commit: Phoenix-1132 - Create merged jar for server side. Adding antlr.*
Repository: phoenix Updated Branches: refs/heads/master 00cd7392d -> 481a9ae07 Phoenix-1132 - Create merged jar for server side. Adding antlr.* Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/481a9ae0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/481a9ae0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/481a9ae0 Branch: refs/heads/master Commit: 481a9ae0724cca5ae790b6b5aa78f206989c2f3d Parents: 00cd739 Author: Mujtaba Authored: Tue Aug 12 11:35:56 2014 -0700 Committer: Mujtaba Committed: Tue Aug 12 11:35:56 2014 -0700 -- phoenix-assembly/src/build/server.xml | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/481a9ae0/phoenix-assembly/src/build/server.xml -- diff --git a/phoenix-assembly/src/build/server.xml b/phoenix-assembly/src/build/server.xml index 3329975..9300528 100644 --- a/phoenix-assembly/src/build/server.xml +++ b/phoenix-assembly/src/build/server.xml @@ -38,5 +38,12 @@ org.apache.phoenix:phoenix-hadoop* + + true + / + +org.antlr:antlr* + +
git commit: Phoenix-1132 - Create merged jar for server side. Adding antlr.*
Repository: phoenix Updated Branches: refs/heads/4.0 56ba12f64 -> d27353ad2 Phoenix-1132 - Create merged jar for server side. Adding antlr.* Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d27353ad Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d27353ad Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d27353ad Branch: refs/heads/4.0 Commit: d27353ad2c0a733745e5d77e4f75d261a1eafd90 Parents: 56ba12f Author: Mujtaba Authored: Tue Aug 12 11:34:59 2014 -0700 Committer: Mujtaba Committed: Tue Aug 12 11:34:59 2014 -0700 -- phoenix-assembly/src/build/server.xml | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d27353ad/phoenix-assembly/src/build/server.xml -- diff --git a/phoenix-assembly/src/build/server.xml b/phoenix-assembly/src/build/server.xml index 3329975..9300528 100644 --- a/phoenix-assembly/src/build/server.xml +++ b/phoenix-assembly/src/build/server.xml @@ -38,5 +38,12 @@ org.apache.phoenix:phoenix-hadoop* + + true + / + +org.antlr:antlr* + +
Apache-Phoenix | Master | Hadoop1 | Build Successful
Master branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-master-hadoop1/lastSuccessfulBuild/artifact/ Last Complete Test Report https://builds.apache.org/job/Phoenix-master-hadoop1/lastCompletedBuild/testReport/ Changes [jtaylor] PHOENIX-1161 Prevent necessity of clearing region cache on every access for local indexing
git commit: PHOENIX-1162 Use physical name instead of logical name when recovering from stale region cache
Repository: phoenix
Updated Branches:
refs/heads/master 53dcc602f -> 00cd7392d
PHOENIX-1162 Use physical name instead of logical name when recovering from
stale region cache
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/00cd7392
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/00cd7392
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/00cd7392
Branch: refs/heads/master
Commit: 00cd7392de11a9b601b55dd13f89cec6090921ba
Parents: 53dcc60
Author: James Taylor
Authored: Tue Aug 12 11:09:32 2014 -0700
Committer: James Taylor
Committed: Tue Aug 12 11:10:46 2014 -0700
--
.../org/apache/phoenix/iterate/ParallelIterators.java | 12
1 file changed, 8 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/00cd7392/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
index dc8fa67..eb2cf71 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
@@ -335,10 +335,14 @@ public class ParallelIterators extends ExplainTable
implements ResultIterators {
if (tableRef.getTable().getBucketNum() != null) {
KeyRange minMaxRange = context.getMinMaxRange();
if (minMaxRange != null) {
-KeyRange splitScanRange =
KeyRange.getKeyRange(splitScan.getStartRow(), splitScan.getStopRow());
-splitScanRange =
splitScanRange.intersect(SaltingUtil.addSaltByte(split.getLowerRange(),
minMaxRange));
-splitScan.setStartRow(splitScanRange.getLowerRange());
-splitScan.setStopRow(splitScanRange.getUpperRange());
+// Add salt byte based on current split, as minMaxRange
won't have it
+minMaxRange =
SaltingUtil.addSaltByte(split.getLowerRange(), minMaxRange);
+// FIXME: seems like this should be possible when we set
the scan start/stop
+// in StatementContext.setScanRanges(). If it doesn't
intersect the range for
+// one salt byte, I don't see how it could intersect it
with any of them.
+if (!ScanUtil.intersectScanRange(splitScan,
minMaxRange.getLowerRange(), minMaxRange.getUpperRange())) {
+continue; // Skip this chunk if no intersection based
on minMaxRange
+}
}
} else if (localIndex) {
// Used to detect stale region boundary information on server
side
Apache-Phoenix | 4.0 | Hadoop1 | Build Successful
4.0 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git Compiled Artifacts https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastCompletedBuild/testReport/ Changes [jtaylor] PHOENIX-1161 Prevent necessity of clearing region cache on every access for local indexing
git commit: PHOENIX-1162 Use physical name instead of logical name when recovering from stale region cache
Repository: phoenix
Updated Branches:
refs/heads/4.0 04874e69e -> 56ba12f64
PHOENIX-1162 Use physical name instead of logical name when recovering from
stale region cache
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/56ba12f6
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/56ba12f6
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/56ba12f6
Branch: refs/heads/4.0
Commit: 56ba12f64516dca2a7660fd5f0bebdfa2c88e326
Parents: 04874e6
Author: James Taylor
Authored: Tue Aug 12 11:09:32 2014 -0700
Committer: James Taylor
Committed: Tue Aug 12 11:09:32 2014 -0700
--
.../org/apache/phoenix/iterate/ParallelIterators.java | 12
1 file changed, 8 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/56ba12f6/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
index dc8fa67..eb2cf71 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
@@ -335,10 +335,14 @@ public class ParallelIterators extends ExplainTable
implements ResultIterators {
if (tableRef.getTable().getBucketNum() != null) {
KeyRange minMaxRange = context.getMinMaxRange();
if (minMaxRange != null) {
-KeyRange splitScanRange =
KeyRange.getKeyRange(splitScan.getStartRow(), splitScan.getStopRow());
-splitScanRange =
splitScanRange.intersect(SaltingUtil.addSaltByte(split.getLowerRange(),
minMaxRange));
-splitScan.setStartRow(splitScanRange.getLowerRange());
-splitScan.setStopRow(splitScanRange.getUpperRange());
+// Add salt byte based on current split, as minMaxRange
won't have it
+minMaxRange =
SaltingUtil.addSaltByte(split.getLowerRange(), minMaxRange);
+// FIXME: seems like this should be possible when we set
the scan start/stop
+// in StatementContext.setScanRanges(). If it doesn't
intersect the range for
+// one salt byte, I don't see how it could intersect it
with any of them.
+if (!ScanUtil.intersectScanRange(splitScan,
minMaxRange.getLowerRange(), minMaxRange.getUpperRange())) {
+continue; // Skip this chunk if no intersection based
on minMaxRange
+}
}
} else if (localIndex) {
// Used to detect stale region boundary information on server
side
git commit: PHOENIX-1162 Use physical name instead of logical name when recovering from stale region cache
Repository: phoenix
Updated Branches:
refs/heads/3.0 aa46fbd01 -> 702881c3e
PHOENIX-1162 Use physical name instead of logical name when recovering from
stale region cache
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/702881c3
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/702881c3
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/702881c3
Branch: refs/heads/3.0
Commit: 702881c3ed0f3a47471f5a3bcfd38d0b7f457539
Parents: aa46fbd
Author: James Taylor
Authored: Tue Aug 12 11:00:47 2014 -0700
Committer: James Taylor
Committed: Tue Aug 12 11:00:47 2014 -0700
--
.../org/apache/phoenix/iterate/ParallelIterators.java| 11 ---
.../phoenix/query/ConnectionQueryServicesImpl.java | 2 ++
2 files changed, 10 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/702881c3/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
index da9a819..989a7be 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
@@ -269,7 +269,7 @@ public class ParallelIterators extends ExplainTable
implements ResultIterators {
}
});
boolean clearedCache = false;
-byte[] tableName = tableRef.getTable().getName().getBytes();
+byte[] tableName =
tableRef.getTable().getPhysicalName().getBytes();
for (Pair> future :
futures) {
try {
PeekingResultIterator iterator =
future.getSecond().get(timeoutMs, TimeUnit.MILLISECONDS);
@@ -320,7 +320,7 @@ public class ParallelIterators extends ExplainTable
implements ResultIterators {
List>> futures) {
final ConnectionQueryServices services =
context.getConnection().getQueryServices();
ExecutorService executor = services.getExecutor();
-for (KeyRange split : splits) {
+for (final KeyRange split : splits) {
final Scan splitScan = ScanUtil.newScan(context.getScan());
// Intersect with existing start/stop key if the table is salted
// If not salted, we've already intersected it. If salted, we need
@@ -331,7 +331,12 @@ public class ParallelIterators extends ExplainTable
implements ResultIterators {
if (minMaxRange != null) {
// Add salt byte based on current split, as minMaxRange
won't have it
minMaxRange =
SaltingUtil.addSaltByte(split.getLowerRange(), minMaxRange);
-split = split.intersect(minMaxRange);
+// FIXME: seems like this should be possible when we set
the scan start/stop
+// in StatementContext.setScanRanges(). If it doesn't
intersect the range for
+// one salt byte, I don't see how it could intersect it
with any of them.
+if (!ScanUtil.intersectScanRange(splitScan,
minMaxRange.getLowerRange(), minMaxRange.getUpperRange())) {
+continue; // Skip this chunk if no intersection based
on minMaxRange
+}
}
}
if (ScanUtil.intersectScanRange(splitScan, split.getLowerRange(),
split.getUpperRange(), this.context.getScanRanges().useSkipScanFilter())) {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/702881c3/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 9eaddf0..7c9332d 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -933,6 +933,7 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
if (dropMetadata) {
admin.disableTable(physicalIndexName);
admin.deleteTable(physicalIndexName);
+clearTableRegionCache(physicalIndexName);
wasDeleted = true;
}
}
@@ -1066,6 +1067,7 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
i
git commit: PHOENIX-1161 Prevent necessity of clearing region cache on every access for local indexing
Repository: phoenix
Updated Branches:
refs/heads/master bdf873f5a -> 53dcc602f
PHOENIX-1161 Prevent necessity of clearing region cache on every access for
local indexing
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/53dcc602
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/53dcc602
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/53dcc602
Branch: refs/heads/master
Commit: 53dcc602fcda987f64982e06b75107c50c78b643
Parents: bdf873f
Author: James Taylor
Authored: Tue Aug 12 09:49:53 2014 -0700
Committer: James Taylor
Committed: Tue Aug 12 09:51:30 2014 -0700
--
.../apache/phoenix/end2end/index/LocalIndexIT.java | 17 +++--
.../coprocessor/BaseScannerRegionObserver.java | 9 +++--
.../LocalIndexParallelIteratorRegionSplitter.java | 1 -
.../apache/phoenix/iterate/ParallelIterators.java | 15 ++-
.../phoenix/query/ConnectionQueryServicesImpl.java | 3 +++
5 files changed, 27 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/53dcc602/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
index a291a37..06e4d86 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
@@ -17,6 +17,7 @@
*/
package org.apache.phoenix.end2end.index;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -91,7 +92,6 @@ public class LocalIndexIT extends BaseIndexIT {
public void testLocalIndexRoundTrip() throws Exception {
createBaseTable(DATA_TABLE_NAME, null, null);
Connection conn1 = DriverManager.getConnection(getUrl());
-Connection conn2 = DriverManager.getConnection(getUrl());
conn1.createStatement().execute("CREATE LOCAL INDEX " +
INDEX_TABLE_NAME + " ON " + DATA_TABLE_NAME + "(v1)");
conn1.createStatement().executeQuery("SELECT * FROM " +
DATA_TABLE_FULL_NAME).next();
PTable localIndex =
conn1.unwrap(PhoenixConnection.class).getMetaDataCache().getTable(new
PTableKey(null,INDEX_TABLE_NAME));
@@ -160,7 +160,7 @@ public class LocalIndexIT extends BaseIndexIT {
assertEquals(IndexRegionSplitPolicy.class.getName(),
htd.getValue(HTableDescriptor.SPLIT_POLICY));
HTable userTable = new
HTable(admin.getConfiguration(),TableName.valueOf(DATA_TABLE_NAME));
HTable indexTable = new
HTable(admin.getConfiguration(),TableName.valueOf(MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME)));
-assertEquals("Both user region and index table should have same split
keys.", userTable.getStartKeys(), indexTable.getStartKeys());
+assertArrayEquals("Both user table and index table should have same
split keys.", userTable.getStartKeys(), indexTable.getStartKeys());
}
@Test
@@ -593,8 +593,6 @@ public class LocalIndexIT extends BaseIndexIT {
ResultSet rs = conn1.createStatement().executeQuery("SELECT
COUNT(*) FROM " + INDEX_TABLE_NAME);
assertTrue(rs.next());
-HBaseAdmin admin = driver.getConnectionQueryServices(getUrl(),
TestUtil.TEST_PROPERTIES).getAdmin();
-
String query = "SELECT t_id FROM " + DATA_TABLE_NAME +" where
(v1,k3) IN (('z',4),('a',2))";
rs = conn1.createStatement().executeQuery(query);
assertTrue(rs.next());
@@ -647,12 +645,6 @@ public class LocalIndexIT extends BaseIndexIT {
}
assertEquals(4 + i, regionsOfIndexTable.size());
String query = "SELECT t_id,k1,v1 FROM " + DATA_TABLE_NAME;
-rs = conn1.createStatement().executeQuery("EXPLAIN "+query);
-assertEquals(
-"CLIENT PARALLEL " + (4+i) + "-WAY RANGE SCAN OVER "
-+
MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME)+" [-32768]\n"+
-"CLIENT MERGE SORT",
-QueryUtil.getExplainPlan(rs));
rs = conn1.createStatement().executeQuery(query);
Thread.sleep(1000);
for (int j = 0; j < 26; j++) {
@@ -661,6 +653,11 @@ public class LocalIndexIT extends BaseIndexIT {
assertEquals(25-j, rs.getInt("k1"));
assertEquals(strings[j], rs.getString("V1"));
}
+rs = conn1.c
git commit: PHOENIX-1161 Prevent necessity of clearing region cache on every access for local indexing
Repository: phoenix
Updated Branches:
refs/heads/4.0 4fa6146b3 -> 04874e69e
PHOENIX-1161 Prevent necessity of clearing region cache on every access for
local indexing
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/04874e69
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/04874e69
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/04874e69
Branch: refs/heads/4.0
Commit: 04874e69e3cc598ae86a14b502789a04635fcc15
Parents: 4fa6146
Author: James Taylor
Authored: Tue Aug 12 09:49:53 2014 -0700
Committer: James Taylor
Committed: Tue Aug 12 09:49:53 2014 -0700
--
.../apache/phoenix/end2end/index/LocalIndexIT.java | 17 +++--
.../coprocessor/BaseScannerRegionObserver.java | 9 +++--
.../LocalIndexParallelIteratorRegionSplitter.java | 1 -
.../apache/phoenix/iterate/ParallelIterators.java | 15 ++-
.../phoenix/query/ConnectionQueryServicesImpl.java | 3 +++
5 files changed, 27 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/04874e69/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
index a291a37..06e4d86 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
@@ -17,6 +17,7 @@
*/
package org.apache.phoenix.end2end.index;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -91,7 +92,6 @@ public class LocalIndexIT extends BaseIndexIT {
public void testLocalIndexRoundTrip() throws Exception {
createBaseTable(DATA_TABLE_NAME, null, null);
Connection conn1 = DriverManager.getConnection(getUrl());
-Connection conn2 = DriverManager.getConnection(getUrl());
conn1.createStatement().execute("CREATE LOCAL INDEX " +
INDEX_TABLE_NAME + " ON " + DATA_TABLE_NAME + "(v1)");
conn1.createStatement().executeQuery("SELECT * FROM " +
DATA_TABLE_FULL_NAME).next();
PTable localIndex =
conn1.unwrap(PhoenixConnection.class).getMetaDataCache().getTable(new
PTableKey(null,INDEX_TABLE_NAME));
@@ -160,7 +160,7 @@ public class LocalIndexIT extends BaseIndexIT {
assertEquals(IndexRegionSplitPolicy.class.getName(),
htd.getValue(HTableDescriptor.SPLIT_POLICY));
HTable userTable = new
HTable(admin.getConfiguration(),TableName.valueOf(DATA_TABLE_NAME));
HTable indexTable = new
HTable(admin.getConfiguration(),TableName.valueOf(MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME)));
-assertEquals("Both user region and index table should have same split
keys.", userTable.getStartKeys(), indexTable.getStartKeys());
+assertArrayEquals("Both user table and index table should have same
split keys.", userTable.getStartKeys(), indexTable.getStartKeys());
}
@Test
@@ -593,8 +593,6 @@ public class LocalIndexIT extends BaseIndexIT {
ResultSet rs = conn1.createStatement().executeQuery("SELECT
COUNT(*) FROM " + INDEX_TABLE_NAME);
assertTrue(rs.next());
-HBaseAdmin admin = driver.getConnectionQueryServices(getUrl(),
TestUtil.TEST_PROPERTIES).getAdmin();
-
String query = "SELECT t_id FROM " + DATA_TABLE_NAME +" where
(v1,k3) IN (('z',4),('a',2))";
rs = conn1.createStatement().executeQuery(query);
assertTrue(rs.next());
@@ -647,12 +645,6 @@ public class LocalIndexIT extends BaseIndexIT {
}
assertEquals(4 + i, regionsOfIndexTable.size());
String query = "SELECT t_id,k1,v1 FROM " + DATA_TABLE_NAME;
-rs = conn1.createStatement().executeQuery("EXPLAIN "+query);
-assertEquals(
-"CLIENT PARALLEL " + (4+i) + "-WAY RANGE SCAN OVER "
-+
MetaDataUtil.getLocalIndexTableName(DATA_TABLE_NAME)+" [-32768]\n"+
-"CLIENT MERGE SORT",
-QueryUtil.getExplainPlan(rs));
rs = conn1.createStatement().executeQuery(query);
Thread.sleep(1000);
for (int j = 0; j < 26; j++) {
@@ -661,6 +653,11 @@ public class LocalIndexIT extends BaseIndexIT {
assertEquals(25-j, rs.getInt("k1"));
assertEquals(strings[j], rs.getString("V1"));
}
+rs = conn1.createS
