[1/2] phoenix git commit: PHOENIX-1991 Implement QueryPlan.getTableRefs()
Repository: phoenix
Updated Branches:
refs/heads/txn 5ff3fca2c - 6f8f39436
PHOENIX-1991 Implement QueryPlan.getTableRefs()
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d71b8204
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d71b8204
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d71b8204
Branch: refs/heads/txn
Commit: d71b82049d8ccda868a88fc4a0590f88259fa9f8
Parents: 5ff3fca
Author: James Taylor jtay...@salesforce.com
Authored: Thu May 21 00:28:55 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Thu May 21 00:28:55 2015 -0700
--
.../end2end/index/TxImmutableIndexIT.java | 2 ++
.../org/apache/phoenix/compile/QueryPlan.java | 5 +++-
.../apache/phoenix/compile/TraceQueryPlan.java | 6
.../apache/phoenix/execute/BaseQueryPlan.java | 10 ++-
.../phoenix/execute/DelegateQueryPlan.java | 6
.../apache/phoenix/execute/HashJoinPlan.java| 31 ++--
.../apache/phoenix/execute/MutationState.java | 9 +-
.../phoenix/execute/SortMergeJoinPlan.java | 13 +++-
.../apache/phoenix/jdbc/PhoenixStatement.java | 10 +--
.../query/ParallelIteratorsSplitTest.java | 14 +++--
10 files changed, 86 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d71b8204/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/TxImmutableIndexIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/TxImmutableIndexIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/TxImmutableIndexIT.java
index 2a5bd69..d37b3a6 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/TxImmutableIndexIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/TxImmutableIndexIT.java
@@ -54,6 +54,7 @@ public class TxImmutableIndexIT extends ImmutableIndexIT {
setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
}
+// TODO: need test case with mix of mutable and immutable indexes
@Test
public void testRollbackOfUncommittedKeyValueIndexChange() throws
Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
@@ -85,6 +86,7 @@ public class TxImmutableIndexIT extends ImmutableIndexIT {
}
}
+// TODO: need test case with mix of mutable and immutable indexes
@Test
public void testRollbackOfUncommittedRowKeyIndexChange() throws Exception {
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d71b8204/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
index a76993c..e2bd97b 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
@@ -19,6 +19,7 @@ package org.apache.phoenix.compile;
import java.sql.SQLException;
import java.util.List;
+import java.util.Set;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.phoenix.compile.GroupByCompiler.GroupBy;
@@ -47,8 +48,10 @@ public interface QueryPlan extends StatementPlan {
public long getEstimatedSize();
-// TODO: change once joins are supported
+@Deprecated
TableRef getTableRef();
+
+SetTableRef getTableRefs();
/**
* Returns projector used to formulate resultSet row
*/
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d71b8204/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
b/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
index 9eb5877..199ce0d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
@@ -22,6 +22,7 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Set;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
@@ -169,6 +170,11 @@ public class TraceQueryPlan implements QueryPlan {
}
@Override
+public SetTableRef getTableRefs() {
+return Collections.emptySet();
+}
+
+@Override
public TableRef getTableRef() {
return null;
}
[2/2] phoenix git commit: Additional comments for handling rollback for immutable indexes
Additional comments for handling rollback for immutable indexes
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6f8f3943
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6f8f3943
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6f8f3943
Branch: refs/heads/txn
Commit: 6f8f39436ef24249af632267ea46594537992f17
Parents: d71b820
Author: James Taylor jtay...@salesforce.com
Authored: Thu May 21 00:33:34 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Thu May 21 00:33:34 2015 -0700
--
.../main/java/org/apache/phoenix/execute/MutationState.java | 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6f8f3943/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
index 062798a..256e487 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
@@ -456,6 +456,11 @@ public class MutationState implements SQLCloseable {
this.tableRef = tableRef;
}
+/**
+ * Called by Tephra when a transaction is aborted. We have this
wrapper so that we get an
+ * opportunity to attach our index meta data to the mutations such
that we can also undo
+ * the index mutations.
+ */
@Override
public void delete(ListDelete deletes) throws IOException {
try {
@@ -483,6 +488,9 @@ public class MutationState implements SQLCloseable {
// If we have mutable indexes, local immutable indexes, or
global immutable indexes
// that reference key value columns, setup index meta data
and attach here. In this
// case updates to the indexes will be generated on the
server side.
+// An alternative would be to let Tephra track the row
keys for the immutable index
+// by adding it as a transaction participant (soon we can
prevent any conflict
+// detection from occurring) with the downside being the
additional memory required.
if (!keyValueIndexes.isEmpty()) {
attachMetaData = true;
IndexMaintainer.serializeAdditional(table,
indexMetaDataPtr, keyValueIndexes, connection);
svn commit: r1680737 - in /phoenix: phoenix-docs/src/docsrc/help/phoenix.csv site/publish/language/index.html
Author: rajeshbabu Date: Thu May 21 06:08:31 2015 New Revision: 1680737 URL: http://svn.apache.org/r1680737 Log: PHOENIX-1982 Documentation for UDF support addendum(Rajeshbabu) Modified: phoenix/phoenix-docs/src/docsrc/help/phoenix.csv phoenix/site/publish/language/index.html Modified: phoenix/phoenix-docs/src/docsrc/help/phoenix.csv URL: http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/docsrc/help/phoenix.csv?rev=1680737r1=1680736r2=1680737view=diff == --- phoenix/phoenix-docs/src/docsrc/help/phoenix.csv (original) +++ phoenix/phoenix-docs/src/docsrc/help/phoenix.csv Thu May 21 06:08:31 2015 @@ -96,11 +96,9 @@ DROP TABLE my_schema.my_table CASCADE; Commands,CREATE FUNCTION, -CREARE FUNCTION funcName +CREATE FUNCTION funcName ([funcArgument[,...]]) -RETURNS dataType -AS className -[USINF JAR jarPath] +RETURNS dataType AS className [USING JAR jarPath] , Creates a new function. The function name is uppercased unless they are double quoted in which case they are case sensitive. The function accepts zero or more arguments. The class name and jar path should be in single quotes. The jar path is optional and if not specified then the class name will be loaded from the jars present in directory configured for hbase.dynamic.jars.dir. Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1680737r1=1680736r2=1680737view=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Thu May 21 06:08:31 2015 @@ -593,23 +593,19 @@ DROP TABLE my_schema.my_table;br /DROP h3 id=create_function class=notranslateCREATE FUNCTION/h3 !-- railroad-start -- pre name=bnf style=display: none -CREARE FUNCTION a href=index.html#namefuncName/a +CREATE FUNCTION a href=index.html#namefuncName/a ([a href=index.html#func_argumentfuncArgument/a[,...]]) -RETURNS a href=index.html#data_typedataType/a -AS a href=index.html#class_nameclassName/a -[USINF JAR a href=index.html#jar_pathjarPath/a] +RETURNS a href=index.html#data_typedataType/a AS a href=index.html#class_nameclassName/a [USING JAR a href=index.html#jar_pathjarPath/a] /pre div name=railroad -table class=railroadtr class=railroadtd class=dcode class=cCREARE FUNCTION a href=index.html#namefuncName/a/code/td/tr/tablebr /table class=railroadtr class=railroadtd class=dcode class=c(/code/tdtd class=dtable class=railroadtr class=railroadtd class=ts/tdtd class=dnbsp;/tdtd class=te/td/trtr class=railroadtd class=ls/tdtd class=dtable class=railroadtr class=railroadtd class=dcode class=ca href=index.html#func_argumentfuncArgument/a/code/tdtd class=dtable class=railroadtr class=railroadtd class=ts/tdtd class=dnbsp;/tdtd class=te/td/trtr class=railroadtd class=ls/tdtd class=dcode class=c, .../code/tdtd class=le/td/tr/table/td/tr/table/tdtd class=le/td/tr/table/tdtd class=dcode class=c)/code/td/tr/tablebr /table class=railroadtr class=railroadtd class =dcode class=cRETURNS a href=index.html#data_typedataType/a/code/td/tr/tablebr /table class=railroadtr class=railroadtd class=dcode class=cAS a href=index.html#class_nameclassName/a/code/td/tr/tablebr /table class=railroadtr class=railroadtd class=ts/tdtd class=dnbsp;/tdtd class=te/td/trtr class=railroadtd class=ls/tdtd class=dtable class=railroadtr class=railroadtd class=dcode class=cUSINF JAR a href=index.html#jar_pathjarPath/a/code/td/tr/table/tdtd class=le/td/tr/table +table class=railroadtr class=railroadtd class=dcode class=cCREATE FUNCTION a href=index.html#namefuncName/a/code/td/tr/tablebr /table class=railroadtr class=railroadtd class=dcode class=c(/code/tdtd class=dtable class=railroadtr class=railroadtd class=ts/tdtd class=dnbsp;/tdtd class=te/td/trtr class=railroadtd class=ls/tdtd class=dtable class=railroadtr class=railroadtd class=dcode class=ca href=index.html#func_argumentfuncArgument/a/code/tdtd class=dtable class=railroadtr class=railroadtd class=ts/tdtd class=dnbsp;/tdtd class=te/td/trtr class=railroadtd class=ls/tdtd class=dcode class=c, .../code/tdtd class=le/td/tr/table/td/tr/table/tdtd class=le/td/tr/table/tdtd class=dcode class=c)/code/td/tr/tablebr /table class=railroadtr class=railroadtd class =dcode class=cRETURNS a href=index.html#data_typedataType/a AS a href=index.html#class_nameclassName/a/code/tdtd class=dtable class=railroadtr class=railroadtd class=ts/tdtd class=dnbsp;/tdtd class=te/td/trtr class=railroadtd class=ls/tdtd class=dtable class=railroadtr class=railroadtd class=dcode class=cUSING JAR a href=index.html#jar_pathjarPath/a/code/td/tr/table/tdtd class=le/td/tr/table/td/tr/table /div !-- railroad-end -- !-- syntax-start pre -CREARE FUNCTION a href=index.html#namefuncName/a +CREATE FUNCTION a href=index.html#namefuncName/a ([a
Git Push Summary
Repository: phoenix Updated Branches: refs/heads/4.4-HBase-0.98 [deleted] bf01eb209
Git Push Summary
Repository: phoenix Updated Branches: refs/heads/4.4-HBase-0.98 [created] bf01eb209
svn commit: r9079 - in /release/phoenix/phoenix-4.4.0-HBase-1.0: ./ bin/ src/
Author: rajeshbabu Date: Thu May 21 20:11:53 2015 New Revision: 9079 Log: 4.4.0-HBase-1.0 release Added: release/phoenix/phoenix-4.4.0-HBase-1.0/ release/phoenix/phoenix-4.4.0-HBase-1.0/bin/ release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz (with props) release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz.asc release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz.md5 release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz.sha release/phoenix/phoenix-4.4.0-HBase-1.0/src/ release/phoenix/phoenix-4.4.0-HBase-1.0/src/phoenix-4.4.0-HBase-1.0-src.tar.gz (with props) release/phoenix/phoenix-4.4.0-HBase-1.0/src/phoenix-4.4.0-HBase-1.0-src.tar.gz.asc release/phoenix/phoenix-4.4.0-HBase-1.0/src/phoenix-4.4.0-HBase-1.0-src.tar.gz.md5 release/phoenix/phoenix-4.4.0-HBase-1.0/src/phoenix-4.4.0-HBase-1.0-src.tar.gz.sha Added: release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz == Binary file - no diff available. Propchange: release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz -- svn:mime-type = application/octet-stream Added: release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz.asc == --- release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz.asc (added) +++ release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz.asc Thu May 21 20:11:53 2015 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQEcBAABCAAGBQJVUIPJAAoJEO2Bo2zjpl28qDIH/RGhPaWOhniUoyJ3HiHjutjT +Ev2YLBWuqCY3+FlHxvxYaTx7MbYxvwXa3hOtxZCsMn1IuR2ckaz8+tDDFLKKoaoT +TUMFCEMlyiyaSEfDcbO94PwbEVjIB9DmYDCQjAXcb4KI+sz/gExoKCLWAuc1bSnI +xRgvTW6yGAClFdsmQrQylmmYY0DPOKgsvX5w03NrGIjnQTMbsxBsfU9131BcS8Bf +VuZ1ySlBBPy+RKlOZxXdihbKey94Mehx28rKjJNYCmyL6hiODQ42aKF5aqATT10Z +tZSD8LbBe6ehmb5TlS/3uflTMjqcEv5JItFhhW3wDiKmVwVsdRJ0j1MN/wtu5sc= +=diHb +-END PGP SIGNATURE- Added: release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz.md5 == --- release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz.md5 (added) +++ release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz.md5 Thu May 21 20:11:53 2015 @@ -0,0 +1,2 @@ +phoenix-4.4.0-HBase-1.0-bin.tar.gz: 93 BE 40 31 2D 64 BE 28 35 7D 51 F8 00 69 +FD 16 Added: release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz.sha == --- release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz.sha (added) +++ release/phoenix/phoenix-4.4.0-HBase-1.0/bin/phoenix-4.4.0-HBase-1.0-bin.tar.gz.sha Thu May 21 20:11:53 2015 @@ -0,0 +1,6 @@ +phoenix-4.4.0-HBase-1.0-bin.tar.gz: 6FD18EF0 D39904D5 E339B35D 0FA8D147 0CEDD98B +5AB1CB33 98F9DE87 91A04F56 75F2BC4B ACC70076 +B4FF0869 7B3CF24C 05C3483D 621E130B 85D4728C +2B321FCF +phoenix-4.4.0-HBase-1.0-bin.tar.gz: A95B5108 8CDED86B 4B1B4260 196BB14C E6A398CF +A185224F BBB212AC 34C7F6B9 Added: release/phoenix/phoenix-4.4.0-HBase-1.0/src/phoenix-4.4.0-HBase-1.0-src.tar.gz == Binary file - no diff available. Propchange: release/phoenix/phoenix-4.4.0-HBase-1.0/src/phoenix-4.4.0-HBase-1.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/phoenix/phoenix-4.4.0-HBase-1.0/src/phoenix-4.4.0-HBase-1.0-src.tar.gz.asc == --- release/phoenix/phoenix-4.4.0-HBase-1.0/src/phoenix-4.4.0-HBase-1.0-src.tar.gz.asc (added) +++ release/phoenix/phoenix-4.4.0-HBase-1.0/src/phoenix-4.4.0-HBase-1.0-src.tar.gz.asc Thu May 21 20:11:53 2015 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQEcBAABCAAGBQJVUIPlAAoJEO2Bo2zjpl28l4cH/j+Q9C9f/JJd2tZCQhjCCfoC +82CurioB9LJVoN3rZrMboGxKDU8AAD/fFi9SeeIh3ih05HmMg6I8EMxJjxOxOiVT +XdSl5SqOLtQVSIg+4lXQaKYYkHDRYogqbympB+UpWXjBOnBcPy2wN2HauxzizjNj +Y62DoyUOHHsh8mN2IJ7SLIqU3R6KkTrEX5p2O9pJwUgArmTMqIwglxkc0b9+zk8B +X9g+YW5IcK9RhndjsDGgLsyR9rFcFLTp0/dlSV+ny9BlxVpo3g6d6pAiA+G3FGDJ +7OuwpPOBxToN5+o0J2r0wrbIylCFpHjpfv25VB8OgOw/j6cHjX7oqXjTqInZ+Qc= +=0nnn +-END PGP SIGNATURE- Added:
phoenix git commit: Change version to 4.4.1-HBase-1.0-SNAPSHOT
Repository: phoenix Updated Branches: refs/heads/4.4-HBase-1.0 bf01eb209 - d77c6edc4 Change version to 4.4.1-HBase-1.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d77c6edc Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d77c6edc Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d77c6edc Branch: refs/heads/4.4-HBase-1.0 Commit: d77c6edc478b1fdaf665c489467adb22d15f Parents: bf01eb2 Author: Rajeshbabu Chintaguntla rajeshb...@apache.org Authored: Fri May 22 02:31:30 2015 +0530 Committer: Rajeshbabu Chintaguntla rajeshb...@apache.org Committed: Fri May 22 02:31:30 2015 +0530 -- phoenix-assembly/pom.xml | 2 +- phoenix-core/pom.xml | 2 +- phoenix-flume/pom.xml | 2 +- phoenix-pherf/pom.xml | 2 +- phoenix-pig/pom.xml | 2 +- phoenix-server-client/pom.xml | 2 +- phoenix-server/pom.xml| 2 +- phoenix-spark/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d77c6edc/phoenix-assembly/pom.xml -- diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 8d9a965..26d2244 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version4.4.0-SNAPSHOT/version +version4.4.1-HBase-1.0-SNAPSHOT/version /parent artifactIdphoenix-assembly/artifactId namePhoenix Assembly/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/d77c6edc/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 45b8d73..36437a8 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -4,7 +4,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version4.4.0-SNAPSHOT/version +version4.4.1-HBase-1.0-SNAPSHOT/version /parent artifactIdphoenix-core/artifactId namePhoenix Core/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/d77c6edc/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 7ed0801..7c81b5a 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version4.4.0-SNAPSHOT/version +version4.4.1-HBase-1.0-SNAPSHOT/version /parent artifactIdphoenix-flume/artifactId namePhoenix - Flume/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/d77c6edc/phoenix-pherf/pom.xml -- diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 0901f71..bbbe3a9 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version4.4.0-SNAPSHOT/version +version4.4.1-HBase-1.0-SNAPSHOT/version /parent artifactIdphoenix-pherf/artifactId http://git-wip-us.apache.org/repos/asf/phoenix/blob/d77c6edc/phoenix-pig/pom.xml -- diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index 2db1af6..f210442 100644 --- a/phoenix-pig/pom.xml +++ b/phoenix-pig/pom.xml @@ -26,7 +26,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version4.4.0-SNAPSHOT/version +version4.4.1-HBase-1.0-SNAPSHOT/version /parent artifactIdphoenix-pig/artifactId namePhoenix - Pig/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/d77c6edc/phoenix-server-client/pom.xml -- diff --git a/phoenix-server-client/pom.xml b/phoenix-server-client/pom.xml index 4d6fd45..1acafca 100644 --- a/phoenix-server-client/pom.xml +++ b/phoenix-server-client/pom.xml @@ -4,7 +4,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version4.4.0-SNAPSHOT/version +version4.4.1-HBase-1.0-SNAPSHOT/version /parent artifactIdphoenix-server-client/artifactId namePhoenix Query Server Client/name http://git-wip-us.apache.org/repos/asf/phoenix/blob/d77c6edc/phoenix-server/pom.xml -- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 9f6289f..b22ed80 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -4,7 +4,7 @@ parent groupIdorg.apache.phoenix/groupId
svn commit: r1680974 - in /phoenix: phoenix-docs/src/docsrc/help/phoenix.csv site/publish/language/functions.html
Author: rajeshbabu
Date: Fri May 22 01:33:41 2015
New Revision: 1680974
URL: http://svn.apache.org/r1680974
Log:
PHOENIX-1817 Document new date/time built-in functions in Functions reference
guide(Alicia Ying Shu)
Modified:
phoenix/phoenix-docs/src/docsrc/help/phoenix.csv
phoenix/site/publish/language/functions.html
Modified: phoenix/phoenix-docs/src/docsrc/help/phoenix.csv
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/docsrc/help/phoenix.csv?rev=1680974r1=1680973r2=1680974view=diff
==
--- phoenix/phoenix-docs/src/docsrc/help/phoenix.csv (original)
+++ phoenix/phoenix-docs/src/docsrc/help/phoenix.csv Fri May 22 01:33:41 2015
@@ -1699,6 +1699,70 @@ Returns offset (shift in minutes) of a t
TIMEZONE_OFFSET('Indian/Cocos', myDate)
+Functions (Time and Date),NOW,
+NOW()
+,
+Returns the current date, bound at the start of the execution of a query based
on the current time on the region server owning the metadata of the table being
queried.
+,
+NOW()
+
+
+Functions (Time and Date),YEAR,
+YEAR(dateTerm|timeTerm|timestampTerm)
+,
+Returns the year of the specified date.
+,
+YEAR(TO_DATE('2015-6-05'))
+
+
+Functions (Time and Date),MONTH,
+MONTH(dateTerm|timeTerm|timestampTerm)
+,
+Returns the month of the specified date.
+,
+MONTH(TO_TIMESTAMP('2015-6-05'))
+
+
+Functions (Time and Date),WEEK,
+WEEK(dateTerm|timeTerm|timestampTerm)
+,
+Returns the week of the specified date.
+,
+WEEK(TO_TIME('2010-6-15'))
+
+
+Functions (Time and Date),DAYOFMONTH,
+DAYOFMONTH(dateTerm|timeTerm|timestampTerm)
+,
+Returns the day of the month of the specified date.
+,
+DAYOFMONTH(TO_DATE('2004-01-18 10:00:10'))
+
+
+Functions (Time and Date),HOUR,
+HOUR(dateTerm|timeTerm|timestampTerm)
+,
+Returns the hour of the specified date.
+,
+HOUR(TO_TIMESTAMP('2015-6-05'))
+
+
+Functions (Time and Date),MINUTE,
+MINUTE(dateTerm|timeTerm|timestampTerm)
+,
+Returns the minute of the specified date.
+,
+MINUTE(TO_TIME('2015-6-05'))
+
+
+Functions (Time and Date),SECOND,
+SECOND(dateTerm|timeTerm|timestampTerm)
+,
+Returns the second of the specified date.
+,
+SECOND(TO_DATE('2015-6-05'))
+
+
Functions (General),COALESCE,
COALESCE( firstTerm, secondTerm )
,
Modified: phoenix/site/publish/language/functions.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1680974r1=1680973r2=1680974view=diff
==
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Fri May 22 01:33:41 2015
@@ -292,6 +292,22 @@ syntax-end --
a href=#convert_tz CONVERT_TZ/abr /
a href=#timezone_offset TIMEZONE_OFFSET/abr /
+
+a href=#now NOW/abr /
+
+a href=#year YEAR/abr /
+
+a href=#month MONTH/abr /
+
+a href=#week WEEK/abr /
+
+a href=#dayofmonth DAYOFMONTH/abr /
+
+a href=#hour HOUR/abr /
+
+a href=#minute MINUTE/abr /
+
+a href=#second SECOND/abr /
/p
syntax-end --
!-- railroad-start --
@@ -302,14 +318,30 @@ syntax-end --
a href=#to_date TO_DATE/abr /
a href=#current_date CURRENT_DATE/abr /
-/tdtd class=index
a href=#current_time CURRENT_TIME/abr /
a href=#convert_tz CONVERT_TZ/abr /
-/tdtd class=index
a href=#timezone_offset TIMEZONE_OFFSET/abr /
+/tdtd class=index
+
+a href=#now NOW/abr /
+
+a href=#year YEAR/abr /
+
+a href=#month MONTH/abr /
+
+a href=#week WEEK/abr /
+
+a href=#dayofmonth DAYOFMONTH/abr /
+/tdtd class=index
+
+a href=#hour HOUR/abr /
+
+a href=#minute MINUTE/abr /
+
+a href=#second SECOND/abr /
/td
/tr
/table
@@ -1275,6 +1307,150 @@ syntax-end --
pExample:/p
p class=notranslateTIMEZONE_OFFSET(#39;Indian/Cocos#39;, myDate)/p
+h3 id=now class=notranslateNOW/h3
+!-- railroad-start --
+pre name=bnf style=display: none
+NOW()
+/pre
+div name=railroad
+table class=railroadtr class=railroadtd class=dcode class=cNOW
( )/code/td/tr/table
+/div
+!-- railroad-end --
+!-- syntax-start
+pre
+NOW()
+/pre
+syntax-end --
+pReturns the current date, bound at the start of the execution of a query
based on the current time on the region server owning the metadata of the table
being queried./p
+pExample:/p
+p class=notranslateNOW()/p
+
+h3 id=year class=notranslateYEAR/h3
+!-- railroad-start --
+pre name=bnf style=display: none
+YEAR(a href=index.html#termdateTerm/a|a
href=index.html#termtimeTerm/a|a href=index.html#termtimestampTerm/a)
+/pre
+div name=railroad
+table
Git Push Summary
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 [created] bf01eb209
Git Push Summary
Repository: phoenix Updated Branches: refs/heads/4.4-HBase-1.1 [created] bf01eb209
Git Push Summary
Repository: phoenix Updated Branches: refs/heads/4.4-HBase-0.98 [created] 4578c10a6
svn commit: r9078 - in /release/phoenix/phoenix-4.4.0-HBase-0.98: ./ bin/ src/
Author: rajeshbabu Date: Thu May 21 19:51:02 2015 New Revision: 9078 Log: 4.4.0-HBase-0.98 release Added: release/phoenix/phoenix-4.4.0-HBase-0.98/ release/phoenix/phoenix-4.4.0-HBase-0.98/bin/ release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz (with props) release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz.asc release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz.md5 release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz.sha release/phoenix/phoenix-4.4.0-HBase-0.98/src/ release/phoenix/phoenix-4.4.0-HBase-0.98/src/phoenix-4.4.0-HBase-0.98-src.tar.gz (with props) release/phoenix/phoenix-4.4.0-HBase-0.98/src/phoenix-4.4.0-HBase-0.98-src.tar.gz.asc release/phoenix/phoenix-4.4.0-HBase-0.98/src/phoenix-4.4.0-HBase-0.98-src.tar.gz.md5 release/phoenix/phoenix-4.4.0-HBase-0.98/src/phoenix-4.4.0-HBase-0.98-src.tar.gz.sha Added: release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz == Binary file - no diff available. Propchange: release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz -- svn:mime-type = application/octet-stream Added: release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz.asc == --- release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz.asc (added) +++ release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz.asc Thu May 21 19:51:02 2015 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQEcBAABCAAGBQJVUEZ3AAoJEO2Bo2zjpl28bSMIALXtEB9bpNiwF5/7NGrG8X5G +E0frkRKHOqsGCrngQLzJxko5hKoG8W4M7x2YXByLlalT620rZ93NV5MZP6aGGyKc +wBrejJQ7hQQxGgF1O/LcyxvZr7kXU04zE94EzjfBOHsWaPFrfYDcRTs1rkga/q97 +w+FQ2amnlH6d/cIMXTOLGoyzSsD5vGEIxAjChiO87L6ouc8WHV+nykmSxau2Bsv6 +407R7xhWh+/hjktqUFkuxeJ2/AYP4etZL05igpfnYSJzjbiInmeCxIW/PlntNehU +1MgD5T3tEPFkLSPE8xCzr7ba4tNdd5iA8yAAZY77kN8ReOlhRsFJCcLDqChUOg0= +=8/IK +-END PGP SIGNATURE- Added: release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz.md5 == --- release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz.md5 (added) +++ release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz.md5 Thu May 21 19:51:02 2015 @@ -0,0 +1,2 @@ +phoenix-4.4.0-HBase-0.98-bin.tar.gz: 29 4A 04 6D 06 CE 52 2B BB 72 13 DB 12 6E + 5C E8 Added: release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz.sha == --- release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz.sha (added) +++ release/phoenix/phoenix-4.4.0-HBase-0.98/bin/phoenix-4.4.0-HBase-0.98-bin.tar.gz.sha Thu May 21 19:51:02 2015 @@ -0,0 +1,6 @@ +phoenix-4.4.0-HBase-0.98-bin.tar.gz: 34481EA7 8B431C46 5BC671FD 16874C43 + C899DFDA 6E64B2B7 3F4B3C17 71D0E053 + C6873B52 A352C7A8 01575DE1 95026915 + 0E1072FD 2C8E623C 9B51273F 996E4623 +phoenix-4.4.0-HBase-0.98-bin.tar.gz: A80B5189 0CD17A5D 369CF8E3 69C9BC52 + 8B1842EE C9463623 A1906433 9D42DA50 Added: release/phoenix/phoenix-4.4.0-HBase-0.98/src/phoenix-4.4.0-HBase-0.98-src.tar.gz == Binary file - no diff available. Propchange: release/phoenix/phoenix-4.4.0-HBase-0.98/src/phoenix-4.4.0-HBase-0.98-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/phoenix/phoenix-4.4.0-HBase-0.98/src/phoenix-4.4.0-HBase-0.98-src.tar.gz.asc == --- release/phoenix/phoenix-4.4.0-HBase-0.98/src/phoenix-4.4.0-HBase-0.98-src.tar.gz.asc (added) +++ release/phoenix/phoenix-4.4.0-HBase-0.98/src/phoenix-4.4.0-HBase-0.98-src.tar.gz.asc Thu May 21 19:51:02 2015 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQEcBAABCAAGBQJVUEaWAAoJEO2Bo2zjpl28qPIH/2nw7C13sRl78PZ+4ca7hEJn +C34upSE3+QsNaaA0UArbJfABsJQaU7xZ0m0vrglV5ssWDsfPzDxGio75CDB6Iwhy +QkFBAm0DcRAjsb1UPcFWp1/b2/x3Kq8MFKP535cvjR0G6fEfgCrJda3G4Li2T8Hw +51gftti/Xc2ClKaaPuUstzJJAtvsggOx4k46IcEJt8czckLQBHfC5lRGBygG/FTF +Y7IbvO7dMivGf1iRcAnwZ6tIZuVMgbbF0CXl2nCa8jqxY6Axahm+Tdd2KQoJRgXE +dk+sbDsVUUt1ACCLJBOpKBOJG7Kej0fS5lBma3T8EYC/C5YFiu2Hut70JDLfL1Y= +=C4ze +-END PGP SIGNATURE-
phoenix git commit: PHOENIX-1984 Make INSTR 1-based instead of 0-based
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 cef3610e5 - 6f5dad93d
PHOENIX-1984 Make INSTR 1-based instead of 0-based
Bring functionality of INSTR built-in function in-line with other
SQL string functions, with indexing of strings starting at 1.
Signed-off-by: Gabriel Reid gabri...@ngdata.com
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6f5dad93
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6f5dad93
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6f5dad93
Branch: refs/heads/4.x-HBase-0.98
Commit: 6f5dad93df5ef6e3e2b446a4630bd0919c7575e6
Parents: cef3610
Author: NAVEEN MADHIRE vmadh...@indiana.edu
Authored: Mon May 18 22:14:57 2015 -0500
Committer: Gabriel Reid gabri...@ngdata.com
Committed: Thu May 21 17:34:10 2015 +0200
--
.../apache/phoenix/end2end/InstrFunctionIT.java | 12 ++---
.../expression/function/InstrFunction.java | 2 +-
.../expression/function/InstrFunctionTest.java | 48 ++--
3 files changed, 31 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6f5dad93/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
index 57c0661..b869ff4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
@@ -63,7 +63,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, ASC, abcdefghijkl,fgh);
String queryToExecute = SELECT INSTR(name, 'fgh') FROM SAMPLE;
-testInstr(conn, queryToExecute, 5);
+testInstr(conn, queryToExecute, 6);
}
@Test
@@ -71,7 +71,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, DESC, abcdefghijkl,fgh);
String queryToExecute = SELECT INSTR(name, 'fgh') FROM SAMPLE;
-testInstr(conn, queryToExecute, 5);
+testInstr(conn, queryToExecute, 6);
}
@Test
@@ -79,7 +79,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, ASC, abcde fghijkl,lmn);
String queryToExecute = SELECT INSTR(name, 'lmn') FROM SAMPLE;
-testInstr(conn, queryToExecute, -1);
+testInstr(conn, queryToExecute, 0);
}
@Test
@@ -87,7 +87,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, DESC, abcde fghijkl,lmn);
String queryToExecute = SELECT INSTR(name, 'lmn') FROM SAMPLE;
-testInstr(conn, queryToExecute, -1);
+testInstr(conn, queryToExecute, 0);
}
@Test
@@ -95,7 +95,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, ASC, AÉɦFGH,Éɦ);
String queryToExecute = SELECT INSTR(name, 'Éɦ') FROM SAMPLE;
-testInstr(conn, queryToExecute, 1);
+testInstr(conn, queryToExecute, 2);
}
@Test
@@ -103,7 +103,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT
{
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, DESC, AÉɦFGH,Éɦ);
String queryToExecute = SELECT INSTR(name, 'Éɦ') FROM SAMPLE;
-testInstr(conn, queryToExecute, 1);
+testInstr(conn, queryToExecute, 2);
}
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6f5dad93/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
index 317d4b3..7a002f8 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
@@ -82,7 +82,7 @@ public class InstrFunction extends ScalarFunction{
String sourceStr = (String) PVarchar.INSTANCE.toObject(ptr,
getChildren().get(0).getSortOrder());
-position = sourceStr.indexOf(strToSearch);
+position =
phoenix git commit: PHOENIX-1984 Make INSTR 1-based instead of 0-based
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.0 b9712982f - a4a79e469
PHOENIX-1984 Make INSTR 1-based instead of 0-based
Bring functionality of INSTR built-in function in-line with other
SQL string functions, with indexing of strings starting at 1.
Signed-off-by: Gabriel Reid gabri...@ngdata.com
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a4a79e46
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a4a79e46
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a4a79e46
Branch: refs/heads/4.x-HBase-1.0
Commit: a4a79e469929d5f4d787afcefd9f5f7867902856
Parents: b971298
Author: NAVEEN MADHIRE vmadh...@indiana.edu
Authored: Mon May 18 22:14:57 2015 -0500
Committer: Gabriel Reid gabri...@ngdata.com
Committed: Thu May 21 17:33:43 2015 +0200
--
.../apache/phoenix/end2end/InstrFunctionIT.java | 12 ++---
.../expression/function/InstrFunction.java | 2 +-
.../expression/function/InstrFunctionTest.java | 48 ++--
3 files changed, 31 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/a4a79e46/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
index 57c0661..b869ff4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
@@ -63,7 +63,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, ASC, abcdefghijkl,fgh);
String queryToExecute = SELECT INSTR(name, 'fgh') FROM SAMPLE;
-testInstr(conn, queryToExecute, 5);
+testInstr(conn, queryToExecute, 6);
}
@Test
@@ -71,7 +71,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, DESC, abcdefghijkl,fgh);
String queryToExecute = SELECT INSTR(name, 'fgh') FROM SAMPLE;
-testInstr(conn, queryToExecute, 5);
+testInstr(conn, queryToExecute, 6);
}
@Test
@@ -79,7 +79,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, ASC, abcde fghijkl,lmn);
String queryToExecute = SELECT INSTR(name, 'lmn') FROM SAMPLE;
-testInstr(conn, queryToExecute, -1);
+testInstr(conn, queryToExecute, 0);
}
@Test
@@ -87,7 +87,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, DESC, abcde fghijkl,lmn);
String queryToExecute = SELECT INSTR(name, 'lmn') FROM SAMPLE;
-testInstr(conn, queryToExecute, -1);
+testInstr(conn, queryToExecute, 0);
}
@Test
@@ -95,7 +95,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, ASC, AÉɦFGH,Éɦ);
String queryToExecute = SELECT INSTR(name, 'Éɦ') FROM SAMPLE;
-testInstr(conn, queryToExecute, 1);
+testInstr(conn, queryToExecute, 2);
}
@Test
@@ -103,7 +103,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT
{
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, DESC, AÉɦFGH,Éɦ);
String queryToExecute = SELECT INSTR(name, 'Éɦ') FROM SAMPLE;
-testInstr(conn, queryToExecute, 1);
+testInstr(conn, queryToExecute, 2);
}
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/a4a79e46/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
index 317d4b3..7a002f8 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
@@ -82,7 +82,7 @@ public class InstrFunction extends ScalarFunction{
String sourceStr = (String) PVarchar.INSTANCE.toObject(ptr,
getChildren().get(0).getSortOrder());
-position = sourceStr.indexOf(strToSearch);
+position = sourceStr.indexOf(strToSearch)
phoenix git commit: PHOENIX-1984 Make INSTR 1-based instead of 0-based
Repository: phoenix
Updated Branches:
refs/heads/master d3ff0798f - c2fed1dac
PHOENIX-1984 Make INSTR 1-based instead of 0-based
Bring functionality of INSTR built-in function in-line with other
SQL string functions, with indexing of strings starting at 1.
Signed-off-by: Gabriel Reid gabri...@ngdata.com
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c2fed1da
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c2fed1da
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c2fed1da
Branch: refs/heads/master
Commit: c2fed1dac8305f489939fc18e47cd2c2a6c596d8
Parents: d3ff079
Author: NAVEEN MADHIRE vmadh...@indiana.edu
Authored: Mon May 18 22:14:57 2015 -0500
Committer: Gabriel Reid gabri...@ngdata.com
Committed: Thu May 21 17:24:47 2015 +0200
--
.../apache/phoenix/end2end/InstrFunctionIT.java | 12 ++---
.../expression/function/InstrFunction.java | 2 +-
.../expression/function/InstrFunctionTest.java | 48 ++--
3 files changed, 31 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2fed1da/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
index 57c0661..b869ff4 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InstrFunctionIT.java
@@ -63,7 +63,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, ASC, abcdefghijkl,fgh);
String queryToExecute = SELECT INSTR(name, 'fgh') FROM SAMPLE;
-testInstr(conn, queryToExecute, 5);
+testInstr(conn, queryToExecute, 6);
}
@Test
@@ -71,7 +71,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, DESC, abcdefghijkl,fgh);
String queryToExecute = SELECT INSTR(name, 'fgh') FROM SAMPLE;
-testInstr(conn, queryToExecute, 5);
+testInstr(conn, queryToExecute, 6);
}
@Test
@@ -79,7 +79,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, ASC, abcde fghijkl,lmn);
String queryToExecute = SELECT INSTR(name, 'lmn') FROM SAMPLE;
-testInstr(conn, queryToExecute, -1);
+testInstr(conn, queryToExecute, 0);
}
@Test
@@ -87,7 +87,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, DESC, abcde fghijkl,lmn);
String queryToExecute = SELECT INSTR(name, 'lmn') FROM SAMPLE;
-testInstr(conn, queryToExecute, -1);
+testInstr(conn, queryToExecute, 0);
}
@Test
@@ -95,7 +95,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT {
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, ASC, AÉɦFGH,Éɦ);
String queryToExecute = SELECT INSTR(name, 'Éɦ') FROM SAMPLE;
-testInstr(conn, queryToExecute, 1);
+testInstr(conn, queryToExecute, 2);
}
@Test
@@ -103,7 +103,7 @@ public class InstrFunctionIT extends BaseHBaseManagedTimeIT
{
Connection conn = DriverManager.getConnection(getUrl());
initTable(conn, DESC, AÉɦFGH,Éɦ);
String queryToExecute = SELECT INSTR(name, 'Éɦ') FROM SAMPLE;
-testInstr(conn, queryToExecute, 1);
+testInstr(conn, queryToExecute, 2);
}
@Test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2fed1da/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
index 317d4b3..7a002f8 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/InstrFunction.java
@@ -82,7 +82,7 @@ public class InstrFunction extends ScalarFunction{
String sourceStr = (String) PVarchar.INSTANCE.toObject(ptr,
getChildren().get(0).getSortOrder());
-position = sourceStr.indexOf(strToSearch);
+position = sourceStr.indexOf(strToSearch) + 1;
phoenix git commit: PHOENIX-1996 Use BytesStringer instead of ZeroCopyByteString
Repository: phoenix
Updated Branches:
refs/heads/master c2fed1dac - 286ff26d8
PHOENIX-1996 Use BytesStringer instead of ZeroCopyByteString
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/286ff26d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/286ff26d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/286ff26d
Branch: refs/heads/master
Commit: 286ff26d82b2638dc5d3db850fa6f4537ab6153f
Parents: c2fed1d
Author: Nick Dimiduk ndimi...@apache.org
Authored: Wed May 20 14:17:47 2015 -0700
Committer: Nick Dimiduk ndimi...@apache.org
Committed: Thu May 21 09:25:34 2015 -0700
--
.../apache/phoenix/cache/ServerCacheClient.java | 10 +++
.../phoenix/coprocessor/MetaDataProtocol.java | 9 +++
.../org/apache/phoenix/parse/PFunction.java | 5 ++--
.../apache/phoenix/protobuf/ProtobufUtil.java | 4 +--
.../query/ConnectionQueryServicesImpl.java | 18 ++---
.../org/apache/phoenix/schema/PColumnImpl.java | 8 +++---
.../org/apache/phoenix/schema/PTableImpl.java | 28 ++--
7 files changed, 40 insertions(+), 42 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/286ff26d/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
index 1233e1c..9718709 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
@@ -44,6 +44,7 @@ import org.apache.hadoop.hbase.client.coprocessor.Batch;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.ipc.BlockingRpcCallback;
import org.apache.hadoop.hbase.ipc.ServerRpcController;
+import org.apache.hadoop.hbase.util.ByteStringer;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.compile.ScanRanges;
import org.apache.phoenix.coprocessor.ServerCachingProtocol.ServerCacheFactory;
@@ -68,7 +69,6 @@ import org.apache.phoenix.util.SQLCloseables;
import org.apache.phoenix.util.ScanUtil;
import com.google.common.collect.ImmutableSet;
-import com.google.protobuf.HBaseZeroCopyByteString;
/**
*
@@ -194,9 +194,9 @@ public class ServerCacheClient {
new
BlockingRpcCallbackAddServerCacheResponse();
AddServerCacheRequest.Builder builder = AddServerCacheRequest.newBuilder();
if(connection.getTenantId() != null){
-
builder.setTenantId(HBaseZeroCopyByteString.wrap(connection.getTenantId().getBytes()));
+
builder.setTenantId(ByteStringer.wrap(connection.getTenantId().getBytes()));
}
-
builder.setCacheId(HBaseZeroCopyByteString.wrap(cacheId));
+
builder.setCacheId(ByteStringer.wrap(cacheId));
builder.setCachePtr(org.apache.phoenix.protobuf.ProtobufUtil.toProto(cachePtr));
ServerCacheFactoryProtos.ServerCacheFactory.Builder svrCacheFactoryBuider =
ServerCacheFactoryProtos.ServerCacheFactory.newBuilder();
svrCacheFactoryBuider.setClassName(cacheFactory.getClass().getName());
@@ -307,9 +307,9 @@ public class ServerCacheClient {
new
BlockingRpcCallbackRemoveServerCacheResponse();
RemoveServerCacheRequest.Builder builder =
RemoveServerCacheRequest.newBuilder();
if(connection.getTenantId() != null){
-
builder.setTenantId(HBaseZeroCopyByteString.wrap(connection.getTenantId().getBytes()));
+
builder.setTenantId(ByteStringer.wrap(connection.getTenantId().getBytes()));
}
-
builder.setCacheId(HBaseZeroCopyByteString.wrap(cacheId));
+
builder.setCacheId(ByteStringer.wrap(cacheId));
phoenix git commit: PHOENIX-1996 Use BytesStringer instead of ZeroCopyByteString
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 6f5dad93d - e86b94df0
PHOENIX-1996 Use BytesStringer instead of ZeroCopyByteString
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e86b94df
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e86b94df
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e86b94df
Branch: refs/heads/4.x-HBase-0.98
Commit: e86b94df09a1784b66520ee4d544564d6dd5ee8f
Parents: 6f5dad9
Author: Nick Dimiduk ndimi...@apache.org
Authored: Wed May 20 14:17:47 2015 -0700
Committer: Nick Dimiduk ndimi...@apache.org
Committed: Thu May 21 09:57:10 2015 -0700
--
.../apache/phoenix/cache/ServerCacheClient.java | 10 +++
.../phoenix/coprocessor/MetaDataProtocol.java | 8 +++---
.../org/apache/phoenix/parse/PFunction.java | 5 ++--
.../apache/phoenix/protobuf/ProtobufUtil.java | 4 +--
.../query/ConnectionQueryServicesImpl.java | 18 ++---
.../org/apache/phoenix/schema/PColumnImpl.java | 8 +++---
.../org/apache/phoenix/schema/PTableImpl.java | 28 ++--
7 files changed, 40 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e86b94df/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
index 1233e1c..9718709 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
@@ -44,6 +44,7 @@ import org.apache.hadoop.hbase.client.coprocessor.Batch;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.ipc.BlockingRpcCallback;
import org.apache.hadoop.hbase.ipc.ServerRpcController;
+import org.apache.hadoop.hbase.util.ByteStringer;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.compile.ScanRanges;
import org.apache.phoenix.coprocessor.ServerCachingProtocol.ServerCacheFactory;
@@ -68,7 +69,6 @@ import org.apache.phoenix.util.SQLCloseables;
import org.apache.phoenix.util.ScanUtil;
import com.google.common.collect.ImmutableSet;
-import com.google.protobuf.HBaseZeroCopyByteString;
/**
*
@@ -194,9 +194,9 @@ public class ServerCacheClient {
new
BlockingRpcCallbackAddServerCacheResponse();
AddServerCacheRequest.Builder builder = AddServerCacheRequest.newBuilder();
if(connection.getTenantId() != null){
-
builder.setTenantId(HBaseZeroCopyByteString.wrap(connection.getTenantId().getBytes()));
+
builder.setTenantId(ByteStringer.wrap(connection.getTenantId().getBytes()));
}
-
builder.setCacheId(HBaseZeroCopyByteString.wrap(cacheId));
+
builder.setCacheId(ByteStringer.wrap(cacheId));
builder.setCachePtr(org.apache.phoenix.protobuf.ProtobufUtil.toProto(cachePtr));
ServerCacheFactoryProtos.ServerCacheFactory.Builder svrCacheFactoryBuider =
ServerCacheFactoryProtos.ServerCacheFactory.newBuilder();
svrCacheFactoryBuider.setClassName(cacheFactory.getClass().getName());
@@ -307,9 +307,9 @@ public class ServerCacheClient {
new
BlockingRpcCallbackRemoveServerCacheResponse();
RemoveServerCacheRequest.Builder builder =
RemoveServerCacheRequest.newBuilder();
if(connection.getTenantId() != null){
-
builder.setTenantId(HBaseZeroCopyByteString.wrap(connection.getTenantId().getBytes()));
+
builder.setTenantId(ByteStringer.wrap(connection.getTenantId().getBytes()));
}
-
builder.setCacheId(HBaseZeroCopyByteString.wrap(cacheId));
+
builder.setCacheId(ByteStringer.wrap(cacheId));
svn commit: r1680925 - in /phoenix: phoenix-docs/src/docsrc/help/phoenix.csv site/publish/language/index.html
Author: rajeshbabu Date: Thu May 21 16:42:01 2015 New Revision: 1680925 URL: http://svn.apache.org/r1680925 Log: PHOENIX-1982 Documentation for UDF support-addendum Modified: phoenix/phoenix-docs/src/docsrc/help/phoenix.csv phoenix/site/publish/language/index.html Modified: phoenix/phoenix-docs/src/docsrc/help/phoenix.csv URL: http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/docsrc/help/phoenix.csv?rev=1680925r1=1680924r2=1680925view=diff == --- phoenix/phoenix-docs/src/docsrc/help/phoenix.csv (original) +++ phoenix/phoenix-docs/src/docsrc/help/phoenix.csv Thu May 21 16:42:01 2015 @@ -96,16 +96,18 @@ DROP TABLE my_schema.my_table CASCADE; Commands,CREATE FUNCTION, -CREATE FUNCTION funcName +CREATE [TEMPORARY] FUNCTION funcName ([funcArgument[,...]]) RETURNS dataType AS className [USING JAR jarPath] , Creates a new function. The function name is uppercased unless they are double quoted in which case they are case sensitive. The function accepts zero or more arguments. The class name and jar path should be in single quotes. The jar path is optional and if not specified then the class name will be loaded from the jars present in directory configured for hbase.dynamic.jars.dir. , + CREATE FUNCTION my_reverse(varchar) returns varchar as 'com.mypackage.MyReverseFunction' using jar 'hdfs:/localhost:8080/hbase/lib/myjar.jar' CREATE FUNCTION my_reverse(varchar) returns varchar as 'com.mypackage.MyReverseFunction' CREATE FUNCTION my_increment(integer, integer constant defaultvalue='10') returns integer as 'com.mypackage.MyIncrementFunction' using jar '/hbase/lib/myincrement.jar' +CREATE TEMPORARY FUNCTION my_reverse(varchar) returns varchar as 'com.mypackage.MyReverseFunction' using jar 'hdfs:/localhost:8080/hbase/lib/myjar.jar' Commands,DROP FUNCTION, Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1680925r1=1680924r2=1680925view=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Thu May 21 16:42:01 2015 @@ -593,17 +593,17 @@ DROP TABLE my_schema.my_table;br /DROP h3 id=create_function class=notranslateCREATE FUNCTION/h3 !-- railroad-start -- pre name=bnf style=display: none -CREATE FUNCTION a href=index.html#namefuncName/a +CREATE [TEMPORARY] FUNCTION a href=index.html#namefuncName/a ([a href=index.html#func_argumentfuncArgument/a[,...]]) RETURNS a href=index.html#data_typedataType/a AS a href=index.html#class_nameclassName/a [USING JAR a href=index.html#jar_pathjarPath/a] /pre div name=railroad -table class=railroadtr class=railroadtd class=dcode class=cCREATE FUNCTION a href=index.html#namefuncName/a/code/td/tr/tablebr /table class=railroadtr class=railroadtd class=dcode class=c(/code/tdtd class=dtable class=railroadtr class=railroadtd class=ts/tdtd class=dnbsp;/tdtd class=te/td/trtr class=railroadtd class=ls/tdtd class=dtable class=railroadtr class=railroadtd class=dcode class=ca href=index.html#func_argumentfuncArgument/a/code/tdtd class=dtable class=railroadtr class=railroadtd class=ts/tdtd class=dnbsp;/tdtd class=te/td/trtr class=railroadtd class=ls/tdtd class=dcode class=c, .../code/tdtd class=le/td/tr/table/td/tr/table/tdtd class=le/td/tr/table/tdtd class=dcode class=c)/code/td/tr/tablebr /table class=railroadtr class=railroadtd class =dcode class=cRETURNS a href=index.html#data_typedataType/a AS a href=index.html#class_nameclassName/a/code/tdtd class=dtable class=railroadtr class=railroadtd class=ts/tdtd class=dnbsp;/tdtd class=te/td/trtr class=railroadtd class=ls/tdtd class=dtable class=railroadtr class=railroadtd class=dcode class=cUSING JAR a href=index.html#jar_pathjarPath/a/code/td/tr/table/tdtd class=le/td/tr/table/td/tr/table +table class=railroadtr class=railroadtd class=dcode class=cCREATE/code/tdtd class=dtable class=railroadtr class=railroadtd class=ts/tdtd class=dnbsp;/tdtd class=te/td/trtr class=railroadtd class=ls/tdtd class=dcode class=cTEMPORARY/code/tdtd class=le/td/tr/table/tdtd class=dcode class=cFUNCTION a href=index.html#namefuncName/a/code/td/tr/tablebr /table class=railroadtr class=railroadtd class=dcode class=c(/code/tdtd class=dtable class=railroadtr class=railroadtd class=ts/tdtd class=dnbsp;/tdtd class=te/td/trtr class=railroadtd class=ls/tdtd class=dtable class=railroadtr class=railroadtd class=dcode class=ca href=index.html#func_argumentfuncArgument/a/code/tdtd class=dtable class=railroadtr class=railroadtd class=ts/tdtd class=dnbsp;/tdtd class=te/td/t rtr class=railroadtd class=ls/tdtd class=dcode class=c, .../code/tdtd class=le/td/tr/table/td/tr/table/tdtd class=le/td/tr/table/tdtd class=dcode class=c)/code/td/tr/tablebr /table class=railroadtr class=railroadtd class=dcode class=cRETURNS
Apache-Phoenix | 4.x-HBase-1.0 | Build Successful
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 [gabrielr] PHOENIX-1984 Make INSTR 1-based instead of 0-based Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout
