(phoenix) branch 5.2 updated: PHOENIX-7333 Add HBase 2.6 profile to multibranch Jenkins job
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 5.2 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.2 by this push: new dfe27b9f91 PHOENIX-7333 Add HBase 2.6 profile to multibranch Jenkins job dfe27b9f91 is described below commit dfe27b9f916b99dab0daa81acad4eb063e86e714 Author: Istvan Toth AuthorDate: Wed Jun 19 09:13:29 2024 +0200 PHOENIX-7333 Add HBase 2.6 profile to multibranch Jenkins job --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ae343ecdd0..2882405ed8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,7 +39,7 @@ pipeline { axes { axis { name 'HBASE_PROFILE' -values '2.4', '2.5' +values '2.4', '2.5', '2.6' } }
(phoenix) branch 5.2 updated: PHOENIX-7335 Bump Phoenix version to 5.2.1-SNAPSHOT (#1913)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 5.2 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.2 by this push: new 99742c6fcc PHOENIX-7335 Bump Phoenix version to 5.2.1-SNAPSHOT (#1913) 99742c6fcc is described below commit 99742c6fcc02f49fbc75ff2e4fc1fb59fecb9437 Author: richardantal AuthorDate: Wed Jun 19 14:52:58 2024 +0200 PHOENIX-7335 Bump Phoenix version to 5.2.1-SNAPSHOT (#1913) --- phoenix-assembly/pom.xml | 2 +- phoenix-client-parent/phoenix-client-embedded/pom.xml | 2 +- phoenix-client-parent/phoenix-client-lite/pom.xml | 2 +- phoenix-client-parent/pom.xml | 2 +- phoenix-core-client/pom.xml | 2 +- phoenix-core-server/pom.xml | 2 +- phoenix-core/pom.xml | 2 +- phoenix-hbase-compat-2.4.1/pom.xml| 2 +- phoenix-hbase-compat-2.5.0/pom.xml| 2 +- phoenix-hbase-compat-2.5.4/pom.xml| 2 +- phoenix-hbase-compat-2.6.0/pom.xml| 2 +- phoenix-mapreduce-byo-shaded-hbase/pom.xml| 2 +- phoenix-pherf/pom.xml | 2 +- phoenix-server/pom.xml| 2 +- phoenix-tracing-webapp/pom.xml| 2 +- pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index ee77d03078..4eb77b96d0 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -22,7 +22,7 @@ org.apache.phoenix phoenix -5.2.0 +5.2.1-SNAPSHOT phoenix-assembly Phoenix Assembly diff --git a/phoenix-client-parent/phoenix-client-embedded/pom.xml b/phoenix-client-parent/phoenix-client-embedded/pom.xml index 22c68f329b..1422db2ff5 100644 --- a/phoenix-client-parent/phoenix-client-embedded/pom.xml +++ b/phoenix-client-parent/phoenix-client-embedded/pom.xml @@ -22,7 +22,7 @@ org.apache.phoenix phoenix-client-parent -5.2.0 +5.2.1-SNAPSHOT phoenix-client-embedded-${hbase.suffix} diff --git a/phoenix-client-parent/phoenix-client-lite/pom.xml b/phoenix-client-parent/phoenix-client-lite/pom.xml index f4ed210710..5c0881a55c 100644 --- a/phoenix-client-parent/phoenix-client-lite/pom.xml +++ b/phoenix-client-parent/phoenix-client-lite/pom.xml @@ -22,7 +22,7 @@ org.apache.phoenix phoenix-client-parent -5.2.0 +5.2.1-SNAPSHOT phoenix-client-lite-${hbase.suffix} diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml index fb8b3cd778..a3111d2549 100644 --- a/phoenix-client-parent/pom.xml +++ b/phoenix-client-parent/pom.xml @@ -22,7 +22,7 @@ org.apache.phoenix phoenix -5.2.0 +5.2.1-SNAPSHOT phoenix-client-parent Phoenix Client Parent diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml index bde947a6a7..640d4a7c9f 100644 --- a/phoenix-core-client/pom.xml +++ b/phoenix-core-client/pom.xml @@ -22,7 +22,7 @@ org.apache.phoenix phoenix -5.2.0 +5.2.1-SNAPSHOT phoenix-core-client Phoenix Core Client diff --git a/phoenix-core-server/pom.xml b/phoenix-core-server/pom.xml index d5032ece29..4afce0d4b3 100644 --- a/phoenix-core-server/pom.xml +++ b/phoenix-core-server/pom.xml @@ -21,7 +21,7 @@ phoenix org.apache.phoenix -5.2.0 +5.2.1-SNAPSHOT 4.0.0 phoenix-core-server diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 9ea22cd5e9..7fd2f369ce 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -22,7 +22,7 @@ org.apache.phoenix phoenix -5.2.0 +5.2.1-SNAPSHOT phoenix-core Phoenix Core diff --git a/phoenix-hbase-compat-2.4.1/pom.xml b/phoenix-hbase-compat-2.4.1/pom.xml index 35da6fbaa8..a2c9a13947 100644 --- a/phoenix-hbase-compat-2.4.1/pom.xml +++ b/phoenix-hbase-compat-2.4.1/pom.xml @@ -23,7 +23,7 @@ org.apache.phoenix phoenix -5.2.0 +5.2.1-SNAPSHOT phoenix-hbase-compat-2.4.1 diff --git a/phoenix-hbase-compat-2.5.0/pom.xml b/phoenix-hbase-compat-2.5.0/pom.xml index e7e4945dee..65766f1763 100644 --- a/phoenix-hbase-compat-2.5.0/pom.xml +++ b/phoenix-hbase-compat-2.5.0/pom.xml @@ -23,7 +23,7 @@ org.apache.phoenix phoenix -5.2.0 +5.2.1-SNAPSHOT phoenix-hbase-compat-2.5.0 diff --git a/phoenix-hbase-compat-2.5.4/pom.xml b/phoenix-hbase-compat-2.5.4/pom.xml index 3698d071d6..de9bc2831d 100644 --- a/phoenix-hbase-compat-2.5.4/pom.xml +++ b/phoenix-hbase-compat-2.5.4/pom.xml @@ -23,7 +23,7 @@ org.apache.phoenix phoenix -5.2.0 +5.2.1-SNAPSHOT phoenix-hbase-compat-2.5.4 diff --git
(phoenix) branch 5.2 updated: PHOENIX-7172: Support HBase 2.6 (#1910)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 5.2 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.2 by this push: new 5c300bc1d0 PHOENIX-7172: Support HBase 2.6 (#1910) 5c300bc1d0 is described below commit 5c300bc1d006333b0873485a72b0ede1ab957efa Author: richardantal AuthorDate: Wed Jun 19 14:32:20 2024 +0200 PHOENIX-7172: Support HBase 2.6 (#1910) --- phoenix-assembly/pom.xml | 5 + phoenix-core-client/pom.xml| 3 + .../phoenix/transaction/OmidTransactionTable.java | 26 - .../regionserver/IndexHalfStoreFileReader.java | 9 +- .../regionserver/LocalIndexStoreFileScanner.java | 9 +- .../hbase/regionserver/wal/IndexedHLogReader.java | 10 +- .../phoenix/compat/hbase/CompatDelegateHTable.java | 13 ++- .../hbase/CompatIndexHalfStoreFileReader.java | 40 .../compat/hbase/CompatIndexedHLogReader.java | 31 ++ .../hbase/CompatLocalIndexStoreFileScanner.java| 33 ++ .../compat/hbase/CompatOmidTransactionTable.java | 42 ++-- .../compat/hbase/CompatPhoenixRpcScheduler.java| 13 ++- .../apache/phoenix/compat/hbase/CompatUtil.java| 15 ++- .../compat/hbase/HbaseCompatCapabilities.java | 13 ++- .../hbase/ReplicationSinkCompatEndpoint.java | 21 ++-- .../phoenix/compat/hbase/CompatDelegateHTable.java | 13 ++- .../hbase/CompatIndexHalfStoreFileReader.java | 40 .../compat/hbase/CompatIndexedHLogReader.java | 31 ++ .../hbase/CompatLocalIndexStoreFileScanner.java| 34 +++ .../compat/hbase/CompatOmidTransactionTable.java | 42 ++-- .../compat/hbase/CompatPhoenixRpcScheduler.java| 13 ++- .../apache/phoenix/compat/hbase/CompatUtil.java| 15 ++- .../compat/hbase/HbaseCompatCapabilities.java | 13 ++- .../hbase/ReplicationSinkCompatEndpoint.java | 21 ++-- .../phoenix/compat/hbase/CompatDelegateHTable.java | 13 ++- .../hbase/CompatIndexHalfStoreFileReader.java | 40 .../compat/hbase/CompatIndexedHLogReader.java | 32 ++ .../hbase/CompatLocalIndexStoreFileScanner.java| 33 ++ .../compat/hbase/CompatOmidTransactionTable.java | 42 ++-- .../compat/hbase/CompatPhoenixRpcScheduler.java| 13 ++- .../apache/phoenix/compat/hbase/CompatUtil.java| 15 ++- .../compat/hbase/HbaseCompatCapabilities.java | 13 ++- .../hbase/ReplicationSinkCompatEndpoint.java | 21 ++-- phoenix-hbase-compat-2.6.0/pom.xml | 113 + .../phoenix/compat/hbase/CompatDelegateHTable.java | 13 ++- .../hbase/CompatIndexHalfStoreFileReader.java | 42 .../compat/hbase/CompatIndexedHLogReader.java | 23 + .../hbase/CompatLocalIndexStoreFileScanner.java| 35 +++ .../compat/hbase/CompatOmidTransactionTable.java | 78 ++ .../compat/hbase/CompatPhoenixRpcScheduler.java| 27 +++-- .../apache/phoenix/compat/hbase/CompatUtil.java| 15 ++- .../compat/hbase/HbaseCompatCapabilities.java | 13 ++- .../hbase/ReplicationSinkCompatEndpoint.java | 21 ++-- pom.xml| 45 +++- 44 files changed, 924 insertions(+), 228 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 409af87a46..ee77d03078 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -276,6 +276,11 @@ phoenix-hbase-compat-2.5.4 ${project.version} + + org.apache.phoenix + phoenix-hbase-compat-2.6.0 + ${project.version} + diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml index f711b0f6fd..bde947a6a7 100644 --- a/phoenix-core-client/pom.xml +++ b/phoenix-core-client/pom.xml @@ -66,6 +66,9 @@ || ("${hbase.compat.version}".equals("2.5.4") hbaseMinor == 5 hbasePatch =4) +|| ("${hbase.compat.version}".equals("2.6.0") + hbaseMinor == 6 + hbasePatch =0) ) diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java index 0e9ddb41a5..483a52b725 100644 --- a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java +++ b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java @@ -44,7 +44,6 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.TableDescriptor; import org.apache.hadoop.hbase.client.coprocessor.Batch.Call; import org.apache.hadoop
(phoenix) branch master updated: PHOENIX-7172: Support HBase 2.6 (#1793)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new ce17ec1daa PHOENIX-7172: Support HBase 2.6 (#1793) ce17ec1daa is described below commit ce17ec1daaa4f064d798ea246909d611eaf61e92 Author: richardantal AuthorDate: Tue Jun 18 12:32:57 2024 +0200 PHOENIX-7172: Support HBase 2.6 (#1793) --- phoenix-assembly/pom.xml | 5 + phoenix-core-client/pom.xml| 3 + .../phoenix/transaction/OmidTransactionTable.java | 26 - .../regionserver/IndexHalfStoreFileReader.java | 9 +- .../regionserver/LocalIndexStoreFileScanner.java | 9 +- .../hbase/regionserver/wal/IndexedHLogReader.java | 10 +- .../phoenix/compat/hbase/CompatDelegateHTable.java | 13 ++- .../hbase/CompatIndexHalfStoreFileReader.java | 40 .../compat/hbase/CompatIndexedHLogReader.java | 31 ++ .../hbase/CompatLocalIndexStoreFileScanner.java| 33 ++ .../compat/hbase/CompatOmidTransactionTable.java | 42 ++-- .../compat/hbase/CompatPhoenixRpcScheduler.java| 13 ++- .../apache/phoenix/compat/hbase/CompatUtil.java| 15 ++- .../compat/hbase/HbaseCompatCapabilities.java | 13 ++- .../hbase/ReplicationSinkCompatEndpoint.java | 21 ++-- .../phoenix/compat/hbase/CompatDelegateHTable.java | 13 ++- .../hbase/CompatIndexHalfStoreFileReader.java | 40 .../compat/hbase/CompatIndexedHLogReader.java | 31 ++ .../hbase/CompatLocalIndexStoreFileScanner.java| 34 +++ .../compat/hbase/CompatOmidTransactionTable.java | 42 ++-- .../compat/hbase/CompatPhoenixRpcScheduler.java| 13 ++- .../apache/phoenix/compat/hbase/CompatUtil.java| 15 ++- .../compat/hbase/HbaseCompatCapabilities.java | 13 ++- .../hbase/ReplicationSinkCompatEndpoint.java | 21 ++-- .../phoenix/compat/hbase/CompatDelegateHTable.java | 13 ++- .../hbase/CompatIndexHalfStoreFileReader.java | 40 .../compat/hbase/CompatIndexedHLogReader.java | 32 ++ .../hbase/CompatLocalIndexStoreFileScanner.java| 33 ++ .../compat/hbase/CompatOmidTransactionTable.java | 42 ++-- .../compat/hbase/CompatPhoenixRpcScheduler.java| 13 ++- .../apache/phoenix/compat/hbase/CompatUtil.java| 15 ++- .../compat/hbase/HbaseCompatCapabilities.java | 13 ++- .../hbase/ReplicationSinkCompatEndpoint.java | 21 ++-- phoenix-hbase-compat-2.6.0/pom.xml | 113 + .../phoenix/compat/hbase/CompatDelegateHTable.java | 13 ++- .../hbase/CompatIndexHalfStoreFileReader.java | 42 .../compat/hbase/CompatIndexedHLogReader.java | 23 + .../hbase/CompatLocalIndexStoreFileScanner.java| 35 +++ .../compat/hbase/CompatOmidTransactionTable.java | 78 ++ .../compat/hbase/CompatPhoenixRpcScheduler.java| 27 +++-- .../apache/phoenix/compat/hbase/CompatUtil.java| 15 ++- .../compat/hbase/HbaseCompatCapabilities.java | 13 ++- .../hbase/ReplicationSinkCompatEndpoint.java | 21 ++-- pom.xml| 45 +++- 44 files changed, 924 insertions(+), 228 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index cf963a1b1f..0ff54a34ff 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -276,6 +276,11 @@ phoenix-hbase-compat-2.5.4 ${project.version} + + org.apache.phoenix + phoenix-hbase-compat-2.6.0 + ${project.version} + diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml index c036d1e377..b926a0d302 100644 --- a/phoenix-core-client/pom.xml +++ b/phoenix-core-client/pom.xml @@ -66,6 +66,9 @@ || ("${hbase.compat.version}".equals("2.5.4") hbaseMinor == 5 hbasePatch =4) +|| ("${hbase.compat.version}".equals("2.6.0") + hbaseMinor == 6 + hbasePatch =0) ) diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java index 0e9ddb41a5..483a52b725 100644 --- a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java +++ b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java @@ -44,7 +44,6 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.TableDescriptor; import org.apache.hadoop.hbase.client.coprocessor.Batch.Call; import org.apache.hadoop
svn commit: r1918253 [3/4] - in /phoenix/site/publish: ./ language/
Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ @@ -169,7 +169,1678 @@ Grammar -update_here + + + +Commands + + + + + + +SELECT + +UPSERT VALUES + +UPSERT SELECT + +DELETE + +DECLARE CURSOR + +OPEN CURSOR + +FETCH NEXT + +CLOSE + +CREATE TABLE + + +DROP TABLE + +CREATE FUNCTION + +DROP FUNCTION + +CREATE VIEW + +DROP VIEW + +CREATE SEQUENCE + +DROP SEQUENCE + +ALTER + +CREATE INDEX + + +DROP INDEX + +ALTER INDEX + +EXPLAIN + +UPDATE STATISTICS + +CREATE SCHEMA + +USE + +DROP SCHEMA + +GRANT + +REVOKE + + + + + +Other Grammar + + + + + + +Constraint + +Options + +Hint + +Scan Hint + +Cache Hint + +Index Hint + +Small Hint + +Seek To Column Hint + +Join Hint + +Serial Hint + +Column Def + +Table Ref + +Sequence Ref + +Column Ref + +Select Expression + +Select Statement + +Split Point + +Table Spec + +Aliased Table Ref + + +Join Type + +Func Argument + +Class Name + +Jar Path + +Order + +Expression + +And Condition + +Boolean Condition + +Condition + +RHS Operand + +Operand + +Summand + +Factor + +Term + +Array Constructor + +Sequence + +Cast + +Row Value Constructor + +Bind Parameter + + +Value + +Case + +Case When + +Name + +Quoted Name + +Alias + +Null + +Data Type + +SQL Data Type + +HBase Data Type + +String + +Boolean + +Numeric + +Int + +Long + +Decimal + +Number + +Comments + + + + + + +SELECT + + +selectStatement [ { UNION ALL selectStatement [...] } ] +[ ORDER BY order [,...] ] [ LIMIT {bindParameter | number} ] +[ OFFSET {bindParameter | number} [ ROW | ROWS ] ] [ FETCH { FIRST | NEXT } {bindParameter | number} { ROW | ROWS } ONLY ] + + +selectStatementUNION ALL selectStatement...ORDER BY order, ...LIMITbindParameter< /td>numberOFFSETbindParameternumber< /td>ROWROWSFETCHFIRSTNEXTbindParameternumberROWROWSONLY + + + +Selects data from one or more tables. UNION ALL combines rows from multiple select statements. ORDER BY sorts the result based on the given expressions. LIMIT(or FETCH FIRST) limits the number of rows returned by the query with no limit applied if unspecified or specified as null or less than zero. The LIMIT(or FETCH FIRST) clause is executed after the ORDER BY clause to support top-N
svn commit: r1918253 [1/4] - in /phoenix/site/publish: ./ language/
Author: richardantal Date: Tue Jun 11 10:38:38 2024 New Revision: 1918253 URL: http://svn.apache.org/viewvc?rev=1918253=rev Log: Generate grammer page Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html phoenix/site/publish/array_type.html phoenix/site/publish/atomic_upsert.html phoenix/site/publish/building.html phoenix/site/publish/building_website.html phoenix/site/publish/bulk_dataload.html phoenix/site/publish/classpath_and_url.html phoenix/site/publish/columnencoding.html phoenix/site/publish/contributing.html phoenix/site/publish/cursors.html phoenix/site/publish/develop.html phoenix/site/publish/download.html phoenix/site/publish/dynamic_columns.html phoenix/site/publish/explainplan.html phoenix/site/publish/faq.html phoenix/site/publish/flume.html phoenix/site/publish/hive_storage_handler.html phoenix/site/publish/index.html phoenix/site/publish/installation.html phoenix/site/publish/issues.html phoenix/site/publish/joins.html phoenix/site/publish/kafka.html phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/mailing_list.html phoenix/site/publish/metrics.html phoenix/site/publish/multi-tenancy.html phoenix/site/publish/namspace_mapping.html phoenix/site/publish/news.html phoenix/site/publish/omid.html phoenix/site/publish/paged.html phoenix/site/publish/performance.html phoenix/site/publish/pherf.html phoenix/site/publish/phoenix_mr.html phoenix/site/publish/phoenix_on_emr.html phoenix/site/publish/phoenix_orm.html phoenix/site/publish/phoenix_python.html phoenix/site/publish/phoenix_spark.html phoenix/site/publish/phoenixcon.html phoenix/site/publish/pig_integration.html phoenix/site/publish/python.html phoenix/site/publish/recent.html phoenix/site/publish/release.html phoenix/site/publish/release_notes.html phoenix/site/publish/resources.html phoenix/site/publish/roadmap.html phoenix/site/publish/rowtimestamp.html phoenix/site/publish/salted.html phoenix/site/publish/secondary_indexing.html phoenix/site/publish/sequences.html phoenix/site/publish/server.html phoenix/site/publish/skip_scan.html phoenix/site/publish/source.html phoenix/site/publish/subqueries.html phoenix/site/publish/tablesample.html phoenix/site/publish/team.html phoenix/site/publish/tech_talks.html phoenix/site/publish/tephra.html phoenix/site/publish/tracing.html phoenix/site/publish/transactions.html phoenix/site/publish/tuning.html phoenix/site/publish/tuning_guide.html phoenix/site/publish/udf.html phoenix/site/publish/update_statistics.html phoenix/site/publish/upgrading.html phoenix/site/publish/views.html phoenix/site/publish/who_is_using.html Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original) +++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/array_type.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/array_type.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/array_type.html (original) +++ phoenix/site/publish/array_type.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/atomic_upsert.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/atomic_upsert.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/atomic_upsert.html (original) +++ phoenix/site/publish/atomic_upsert.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/building.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/building.html (original) +++ phoenix/site/publish/building.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/building_website.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building_website.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/building_website.html (original) +++ phoenix/site/publish/building_website.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/bulk_dataload.html URL
svn commit: r1918253 [2/4] - in /phoenix/site/publish: ./ language/
Modified: phoenix/site/publish/language/functions.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/language/functions.html (original) +++ phoenix/site/publish/language/functions.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ @@ -169,7 +169,1908 @@ Functions -update_here + + + +Aggregate Functions + + + + + + +AVG + +COUNT + +APPROX_COUNT_DISTINCT + +MAX + +MIN + +SUM + + +PERCENTILE_CONT + +PERCENTILE_DISC + +PERCENT_RANK + +FIRST_VALUE + +LAST_VALUE + +FIRST_VALUES + + +LAST_VALUES + +NTH_VALUE + +STDDEV_POP + +STDDEV_SAMP + + + + + +String Functions + + + + + + +SUBSTR + +INSTR + +TRIM + +LTRIM + +RTRIM + + +LPAD + +LENGTH + +REGEXP_SUBSTR + +REGEXP_REPLACE + +REGEXP_SPLIT + + +UPPER + +LOWER + +REVERSE + +TO_CHAR + +COLLATION_KEY + + + + + +Time and Date Functions + + + + + + +TO_DATE + +CURRENT_DATE + +TO_TIME + +TO_TIMESTAMP + +CURRENT_TIME + +CONVERT_TZ + + +TIMEZONE_OFFSET + +NOW + +YEAR + +MONTH + +WEEK + +DAYOFYEAR + + +DAYOFMONTH + +DAYOFWEEK + +HOUR + +MINUTE + +SECOND + + + + + +Numeric Functions + + + + + + +ROUND + +CEIL + + +FLOOR + +TRUNC + + +TO_NUMBER + +RAND + + + + + +Array Functions + + + + + + +ARRAY_ELEM + +ARRAY_LENGTH + +ARRAY_APPEND + + +ARRAY_PREPEND + +ARRAY_CAT + +ARRAY_FILL + + +ARRAY_TO_STRING + +ANY + +ALL + + + + + +Math Functions + + + + + + +SIGN + +ABS + +SQRT + + +CBRT + +EXP + +POWER + + +LN + +LOG + + + + + +Other Functions + + + + + + +MD5 + +INVERT + +ENCODE + +DECODE + + +COALESCE + +GET_BIT + +GET_BYTE + +OCTET_LENGTH + + +SET_BIT + +SET_BYTE + + + + + + + +AVG + + +AVG ( { numericTerm } ) + + +AVG ( numericTerm ) + + + +The average (mean) value. If no rows are selected, the result is NULL. Aggregates are only allowed in select statements. The returned value is of the same data type as the parameter. +Example: +AVG(X) + +COUNT + + +COUNT( [ DISTINCT ] { * | { term } } ) + + +COUNT (DISTINCT*term) + + + +The count of all row, or of the non-null values. This method returns a long. When DISTINCT is used, it
svn commit: r1918253 [4/4] - in /phoenix/site/publish: ./ language/
Modified: phoenix/site/publish/metrics.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/metrics.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/metrics.html (original) +++ phoenix/site/publish/metrics.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/multi-tenancy.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/multi-tenancy.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/multi-tenancy.html (original) +++ phoenix/site/publish/multi-tenancy.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/namspace_mapping.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/namspace_mapping.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/namspace_mapping.html (original) +++ phoenix/site/publish/namspace_mapping.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/news.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/news.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/news.html (original) +++ phoenix/site/publish/news.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/omid.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/omid.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/omid.html (original) +++ phoenix/site/publish/omid.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/paged.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/paged.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/paged.html (original) +++ phoenix/site/publish/paged.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/performance.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/performance.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/performance.html (original) +++ phoenix/site/publish/performance.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/pherf.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/pherf.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/pherf.html (original) +++ phoenix/site/publish/pherf.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_mr.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_mr.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/phoenix_mr.html (original) +++ phoenix/site/publish/phoenix_mr.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_on_emr.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_on_emr.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/phoenix_on_emr.html (original) +++ phoenix/site/publish/phoenix_on_emr.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_orm.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_orm.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/phoenix_orm.html (original) +++ phoenix/site/publish/phoenix_orm.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_python.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_python.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/phoenix_python.html (original) +++ phoenix/site/publish/phoenix_python.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_spark.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_spark.html?rev=1918253=1918252=1918253=diff == --- phoenix/site/publish/phoenix_spark.html (original) +++ phoenix/site/publish/phoenix_spark.html Tue Jun 11 10:38:38 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenixcon.html URL:
svn commit: r1918226 - in /phoenix/site: publish/ publish/language/ source/src/site/markdown/
Author: richardantal Date: Mon Jun 10 07:46:52 2024 New Revision: 1918226 URL: http://svn.apache.org/viewvc?rev=1918226=rev Log: Release PhoenixDB 1.2.2 addendum Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html phoenix/site/publish/array_type.html phoenix/site/publish/atomic_upsert.html phoenix/site/publish/building.html phoenix/site/publish/building_website.html phoenix/site/publish/bulk_dataload.html phoenix/site/publish/classpath_and_url.html phoenix/site/publish/columnencoding.html phoenix/site/publish/contributing.html phoenix/site/publish/cursors.html phoenix/site/publish/develop.html phoenix/site/publish/download.html phoenix/site/publish/dynamic_columns.html phoenix/site/publish/explainplan.html phoenix/site/publish/faq.html phoenix/site/publish/flume.html phoenix/site/publish/hive_storage_handler.html phoenix/site/publish/index.html phoenix/site/publish/installation.html phoenix/site/publish/issues.html phoenix/site/publish/joins.html phoenix/site/publish/kafka.html phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/mailing_list.html phoenix/site/publish/metrics.html phoenix/site/publish/multi-tenancy.html phoenix/site/publish/namspace_mapping.html phoenix/site/publish/news.html phoenix/site/publish/omid.html phoenix/site/publish/paged.html phoenix/site/publish/performance.html phoenix/site/publish/pherf.html phoenix/site/publish/phoenix_mr.html phoenix/site/publish/phoenix_on_emr.html phoenix/site/publish/phoenix_orm.html phoenix/site/publish/phoenix_python.html phoenix/site/publish/phoenix_spark.html phoenix/site/publish/phoenixcon.html phoenix/site/publish/pig_integration.html phoenix/site/publish/python.html phoenix/site/publish/recent.html phoenix/site/publish/release.html phoenix/site/publish/release_notes.html phoenix/site/publish/resources.html phoenix/site/publish/roadmap.html phoenix/site/publish/rowtimestamp.html phoenix/site/publish/salted.html phoenix/site/publish/secondary_indexing.html phoenix/site/publish/sequences.html phoenix/site/publish/server.html phoenix/site/publish/skip_scan.html phoenix/site/publish/source.html phoenix/site/publish/subqueries.html phoenix/site/publish/tablesample.html phoenix/site/publish/team.html phoenix/site/publish/tech_talks.html phoenix/site/publish/tephra.html phoenix/site/publish/tracing.html phoenix/site/publish/transactions.html phoenix/site/publish/tuning.html phoenix/site/publish/tuning_guide.html phoenix/site/publish/udf.html phoenix/site/publish/update_statistics.html phoenix/site/publish/upgrading.html phoenix/site/publish/views.html phoenix/site/publish/who_is_using.html phoenix/site/source/src/site/markdown/download.md Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html?rev=1918226=1918225=1918226=diff == --- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original) +++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Mon Jun 10 07:46:52 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/array_type.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/array_type.html?rev=1918226=1918225=1918226=diff == --- phoenix/site/publish/array_type.html (original) +++ phoenix/site/publish/array_type.html Mon Jun 10 07:46:52 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/atomic_upsert.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/atomic_upsert.html?rev=1918226=1918225=1918226=diff == --- phoenix/site/publish/atomic_upsert.html (original) +++ phoenix/site/publish/atomic_upsert.html Mon Jun 10 07:46:52 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/building.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building.html?rev=1918226=1918225=1918226=diff == --- phoenix/site/publish/building.html (original) +++ phoenix/site/publish/building.html Mon Jun 10 07:46:52 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/building_website.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building_website.html?rev=1918226=1918225=1918226=diff == --- phoenix/site/publish/building_website.html (original) +++ phoenix/site/publish/building_website.html Mon Jun 10 07:46:52 2024 @@ -1,7 +1,7
svn commit: r1918202 [1/4] - in /phoenix/site/publish: ./ language/
Author: richardantal Date: Fri Jun 7 14:00:27 2024 New Revision: 1918202 URL: http://svn.apache.org/viewvc?rev=1918202=rev Log: Release PhoenixDB 1.2.2 Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html phoenix/site/publish/array_type.html phoenix/site/publish/atomic_upsert.html phoenix/site/publish/building.html phoenix/site/publish/building_website.html phoenix/site/publish/bulk_dataload.html phoenix/site/publish/classpath_and_url.html phoenix/site/publish/columnencoding.html phoenix/site/publish/contributing.html phoenix/site/publish/cursors.html phoenix/site/publish/develop.html phoenix/site/publish/download.html phoenix/site/publish/dynamic_columns.html phoenix/site/publish/explainplan.html phoenix/site/publish/faq.html phoenix/site/publish/flume.html phoenix/site/publish/hive_storage_handler.html phoenix/site/publish/index.html phoenix/site/publish/installation.html phoenix/site/publish/issues.html phoenix/site/publish/joins.html phoenix/site/publish/kafka.html phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/mailing_list.html phoenix/site/publish/metrics.html phoenix/site/publish/multi-tenancy.html phoenix/site/publish/namspace_mapping.html phoenix/site/publish/news.html phoenix/site/publish/omid.html phoenix/site/publish/paged.html phoenix/site/publish/performance.html phoenix/site/publish/pherf.html phoenix/site/publish/phoenix_mr.html phoenix/site/publish/phoenix_on_emr.html phoenix/site/publish/phoenix_orm.html phoenix/site/publish/phoenix_python.html phoenix/site/publish/phoenix_spark.html phoenix/site/publish/phoenixcon.html phoenix/site/publish/pig_integration.html phoenix/site/publish/python.html phoenix/site/publish/recent.html phoenix/site/publish/release.html phoenix/site/publish/release_notes.html phoenix/site/publish/resources.html phoenix/site/publish/roadmap.html phoenix/site/publish/rowtimestamp.html phoenix/site/publish/salted.html phoenix/site/publish/secondary_indexing.html phoenix/site/publish/sequences.html phoenix/site/publish/server.html phoenix/site/publish/skip_scan.html phoenix/site/publish/source.html phoenix/site/publish/subqueries.html phoenix/site/publish/tablesample.html phoenix/site/publish/team.html phoenix/site/publish/tech_talks.html phoenix/site/publish/tephra.html phoenix/site/publish/tracing.html phoenix/site/publish/transactions.html phoenix/site/publish/tuning.html phoenix/site/publish/tuning_guide.html phoenix/site/publish/udf.html phoenix/site/publish/update_statistics.html phoenix/site/publish/upgrading.html phoenix/site/publish/views.html phoenix/site/publish/who_is_using.html Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original) +++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/array_type.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/array_type.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/array_type.html (original) +++ phoenix/site/publish/array_type.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/atomic_upsert.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/atomic_upsert.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/atomic_upsert.html (original) +++ phoenix/site/publish/atomic_upsert.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/building.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/building.html (original) +++ phoenix/site/publish/building.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/building_website.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building_website.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/building_website.html (original) +++ phoenix/site/publish/building_website.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/bulk_dataload.html URL
svn commit: r1918202 [4/4] - in /phoenix/site/publish: ./ language/
Modified: phoenix/site/publish/metrics.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/metrics.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/metrics.html (original) +++ phoenix/site/publish/metrics.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/multi-tenancy.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/multi-tenancy.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/multi-tenancy.html (original) +++ phoenix/site/publish/multi-tenancy.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/namspace_mapping.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/namspace_mapping.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/namspace_mapping.html (original) +++ phoenix/site/publish/namspace_mapping.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/news.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/news.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/news.html (original) +++ phoenix/site/publish/news.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/omid.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/omid.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/omid.html (original) +++ phoenix/site/publish/omid.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/paged.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/paged.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/paged.html (original) +++ phoenix/site/publish/paged.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/performance.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/performance.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/performance.html (original) +++ phoenix/site/publish/performance.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/pherf.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/pherf.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/pherf.html (original) +++ phoenix/site/publish/pherf.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_mr.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_mr.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/phoenix_mr.html (original) +++ phoenix/site/publish/phoenix_mr.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_on_emr.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_on_emr.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/phoenix_on_emr.html (original) +++ phoenix/site/publish/phoenix_on_emr.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_orm.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_orm.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/phoenix_orm.html (original) +++ phoenix/site/publish/phoenix_orm.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_python.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_python.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/phoenix_python.html (original) +++ phoenix/site/publish/phoenix_python.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_spark.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_spark.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/phoenix_spark.html (original) +++ phoenix/site/publish/phoenix_spark.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenixcon.html URL:
svn commit: r1918202 [2/4] - in /phoenix/site/publish: ./ language/
Modified: phoenix/site/publish/language/functions.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/language/functions.html (original) +++ phoenix/site/publish/language/functions.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ @@ -169,1908 +169,7 @@ Functions - - - -Aggregate Functions - - - - - - -AVG - -COUNT - -APPROX_COUNT_DISTINCT - -MAX - -MIN - -SUM - - -PERCENTILE_CONT - -PERCENTILE_DISC - -PERCENT_RANK - -FIRST_VALUE - -LAST_VALUE - -FIRST_VALUES - - -LAST_VALUES - -NTH_VALUE - -STDDEV_POP - -STDDEV_SAMP - - - - - -String Functions - - - - - - -SUBSTR - -INSTR - -TRIM - -LTRIM - -RTRIM - - -LPAD - -LENGTH - -REGEXP_SUBSTR - -REGEXP_REPLACE - -REGEXP_SPLIT - - -UPPER - -LOWER - -REVERSE - -TO_CHAR - -COLLATION_KEY - - - - - -Time and Date Functions - - - - - - -TO_DATE - -CURRENT_DATE - -TO_TIME - -TO_TIMESTAMP - -CURRENT_TIME - -CONVERT_TZ - - -TIMEZONE_OFFSET - -NOW - -YEAR - -MONTH - -WEEK - -DAYOFYEAR - - -DAYOFMONTH - -DAYOFWEEK - -HOUR - -MINUTE - -SECOND - - - - - -Numeric Functions - - - - - - -ROUND - -CEIL - - -FLOOR - -TRUNC - - -TO_NUMBER - -RAND - - - - - -Array Functions - - - - - - -ARRAY_ELEM - -ARRAY_LENGTH - -ARRAY_APPEND - - -ARRAY_PREPEND - -ARRAY_CAT - -ARRAY_FILL - - -ARRAY_TO_STRING - -ANY - -ALL - - - - - -Math Functions - - - - - - -SIGN - -ABS - -SQRT - - -CBRT - -EXP - -POWER - - -LN - -LOG - - - - - -Other Functions - - - - - - -MD5 - -INVERT - -ENCODE - -DECODE - - -COALESCE - -GET_BIT - -GET_BYTE - -OCTET_LENGTH - - -SET_BIT - -SET_BYTE - - - - - - - -AVG - - -AVG ( { numericTerm } ) - - -AVG ( numericTerm ) - - - -The average (mean) value. If no rows are selected, the result is NULL. Aggregates are only allowed in select statements. The returned value is of the same data type as the parameter. -Example: -AVG(X) - -COUNT - - -COUNT( [ DISTINCT ] { * | { term } } ) - - -COUNT (DISTINCT*term) - - - -The count of all row, or of the non-null values. This method returns a long. When DISTINCT is used, it counts only
svn commit: r1918202 [3/4] - in /phoenix/site/publish: ./ language/
Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1918202=1918201=1918202=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Fri Jun 7 14:00:27 2024 @@ -1,7 +1,7 @@ @@ -169,1678 +169,7 @@ Grammar - - - -Commands - - - - - - -SELECT - -UPSERT VALUES - -UPSERT SELECT - -DELETE - -DECLARE CURSOR - -OPEN CURSOR - -FETCH NEXT - -CLOSE - -CREATE TABLE - - -DROP TABLE - -CREATE FUNCTION - -DROP FUNCTION - -CREATE VIEW - -DROP VIEW - -CREATE SEQUENCE - -DROP SEQUENCE - -ALTER - -CREATE INDEX - - -DROP INDEX - -ALTER INDEX - -EXPLAIN - -UPDATE STATISTICS - -CREATE SCHEMA - -USE - -DROP SCHEMA - -GRANT - -REVOKE - - - - - -Other Grammar - - - - - - -Constraint - -Options - -Hint - -Scan Hint - -Cache Hint - -Index Hint - -Small Hint - -Seek To Column Hint - -Join Hint - -Serial Hint - -Column Def - -Table Ref - -Sequence Ref - -Column Ref - -Select Expression - -Select Statement - -Split Point - -Table Spec - -Aliased Table Ref - - -Join Type - -Func Argument - -Class Name - -Jar Path - -Order - -Expression - -And Condition - -Boolean Condition - -Condition - -RHS Operand - -Operand - -Summand - -Factor - -Term - -Array Constructor - -Sequence - -Cast - -Row Value Constructor - -Bind Parameter - - -Value - -Case - -Case When - -Name - -Quoted Name - -Alias - -Null - -Data Type - -SQL Data Type - -HBase Data Type - -String - -Boolean - -Numeric - -Int - -Long - -Decimal - -Number - -Comments - - - - - - -SELECT - - -selectStatement [ { UNION ALL selectStatement [...] } ] -[ ORDER BY order [,...] ] [ LIMIT {bindParameter | number} ] -[ OFFSET {bindParameter | number} [ ROW | ROWS ] ] [ FETCH { FIRST | NEXT } {bindParameter | number} { ROW | ROWS } ONLY ] - - -selectStatementUNION ALL selectStatement...ORDER BY order, ...LIMITbindParameter< /td>numberOFFSETbindParameternumber< /td>ROWROWSFETCHFIRSTNEXTbindParameternumberROWROWSONLY - - - -Selects data from one or more tables. UNION ALL combines rows from multiple select statements. ORDER BY sorts the result based on the given expressions. LIMIT(or FETCH FIRST) limits the number of rows returned by the query with no limit applied if unspecified or specified as null or less than zero. The LIMIT(or FETCH FIRST) clause is executed after the ORDER BY clause to support top-N type queries.
(phoenix-queryserver) branch master updated: PHOENIX-7327 Bump phoenixdb version to 1.2.3.dev0 after release (#155)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new 1f5ffdd PHOENIX-7327 Bump phoenixdb version to 1.2.3.dev0 after release (#155) 1f5ffdd is described below commit 1f5ffddc60f8cff6332a3fbcec27e1190925bee0 Author: richardantal AuthorDate: Fri Jun 7 15:52:15 2024 +0200 PHOENIX-7327 Bump phoenixdb version to 1.2.3.dev0 after release (#155) --- python-phoenixdb/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-phoenixdb/setup.py b/python-phoenixdb/setup.py index 88bc693..2e078dd 100644 --- a/python-phoenixdb/setup.py +++ b/python-phoenixdb/setup.py @@ -61,7 +61,7 @@ else: 'Sphinx;python_version>="3.6"', ], -version = "1.2.2" +version = "1.2.3.dev0" setup( name="phoenixdb",
(phoenix-queryserver) annotated tag python-phoenixdb-1.2.2 updated (db3aa25 -> 1677421)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to annotated tag python-phoenixdb-1.2.2 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git *** WARNING: tag python-phoenixdb-1.2.2 was modified! *** from db3aa25 (commit) to 1677421 (tag) tagging db3aa254741ffbcbf0427bd816426ce10c90b4e4 (commit) replaces python-phoenixdb-1.2.2.rc0 by Richard Antal on Fri Jun 7 15:25:21 2024 +0200 - Log - python-phoenixdb-1.2.2 --- No new revisions were added by this update. Summary of changes:
svn commit: r69601 - /dev/phoenix/python-phoenixdb-1.2.2.rc1/ /release/phoenix/python-phoenixdb-1.2.2/
Author: richardantal Date: Fri Jun 7 13:17:29 2024 New Revision: 69601 Log: PHOENIX-7312 Release PhoenixDB 1.2.2 Added: release/phoenix/python-phoenixdb-1.2.2/ - copied from r69600, dev/phoenix/python-phoenixdb-1.2.2.rc1/ Removed: dev/phoenix/python-phoenixdb-1.2.2.rc1/
svn commit: r69535 - in /dev/phoenix/python-phoenixdb-1.2.2.rc1: ./ src/ src/python-phoenixdb-1.2.2-src.tar.gz src/python-phoenixdb-1.2.2-src.tar.gz.asc src/python-phoenixdb-1.2.2-src.tar.gz.sha512
Author: richardantal Date: Tue Jun 4 12:33:11 2024 New Revision: 69535 Log: Create python-phoenixdb-1.2.2 rc1 Added: dev/phoenix/python-phoenixdb-1.2.2.rc1/ dev/phoenix/python-phoenixdb-1.2.2.rc1/src/ dev/phoenix/python-phoenixdb-1.2.2.rc1/src/python-phoenixdb-1.2.2-src.tar.gz (with props) dev/phoenix/python-phoenixdb-1.2.2.rc1/src/python-phoenixdb-1.2.2-src.tar.gz.asc dev/phoenix/python-phoenixdb-1.2.2.rc1/src/python-phoenixdb-1.2.2-src.tar.gz.sha512 Added: dev/phoenix/python-phoenixdb-1.2.2.rc1/src/python-phoenixdb-1.2.2-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/python-phoenixdb-1.2.2.rc1/src/python-phoenixdb-1.2.2-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/python-phoenixdb-1.2.2.rc1/src/python-phoenixdb-1.2.2-src.tar.gz.asc == --- dev/phoenix/python-phoenixdb-1.2.2.rc1/src/python-phoenixdb-1.2.2-src.tar.gz.asc (added) +++ dev/phoenix/python-phoenixdb-1.2.2.rc1/src/python-phoenixdb-1.2.2-src.tar.gz.asc Tue Jun 4 12:33:11 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEeBOGKoWvu7T+ccyV57h6o/+o7a0FAmZfB/EACgkQ57h6o/+o +7a36dQ/+Lll/BMTllTbZdh+M99akXcm564g2X23NtUPjhVGYADbflRp6hOfRzkSr +h86RICzIXLx66mOx+F2zDFYnWJA3GUIC0lwtys0dCC0llqY1A1VgQBLjOjsmd+QS +Q+UeMXWqVN1VvZAWLSmIA9H6OBRHjVdXvNLU1O5YZRPuHehn7yLUSYFQZHcl7vAa +xwjlaiMvTQmd6V8dS8mjR8lIzVcq1IJqyaFlMb1uVY+VIaJmxFOLUMXxXknL0n2Y +quP9HiWxyIZXsJ86LBqRfm2Kj+BjQY4M1emnnX3H6+As9W2fJ0S3HlXfwPmr/7gS +h6h8IaizSTAqbDvhvZbQv/a5P6vBc1e5Wtajr1vcR06U4gl2Ue9EKen64FNwGiKP +qH5N/9qAPCvzFCyXPFVMQTXgjWpKcoU4ZAVlc1U0QwVfW/uIyQ5eIq/jJjoYZ4ZO +LtWx153zq2I2Q//c6ygL7+xI77fvUHeT5UP7cQkHaa7jDD1HRhJUHm15wLskkHvp +q6gkN6AX/6urHuNT9bmm61yI7JktcLrcJrWz99bQyIxwtidQV6pCNEXezOvJXBIT +UWJ8PGfZzITf4GSeZYVGweRkgPVSRCSqiFLfhgvhengfgcUMwJbFAwSqGAUr9OHs +h7EOhcn3gm722jQ97IH13MBCIjhkYQ8y8GtpHoF40BGbk8BHc5Y= +=/Ua1 +-END PGP SIGNATURE- Added: dev/phoenix/python-phoenixdb-1.2.2.rc1/src/python-phoenixdb-1.2.2-src.tar.gz.sha512 == --- dev/phoenix/python-phoenixdb-1.2.2.rc1/src/python-phoenixdb-1.2.2-src.tar.gz.sha512 (added) +++ dev/phoenix/python-phoenixdb-1.2.2.rc1/src/python-phoenixdb-1.2.2-src.tar.gz.sha512 Tue Jun 4 12:33:11 2024 @@ -0,0 +1 @@ +SHA2-512(python-phoenixdb-1.2.2-src.tar.gz)= 8944e80a12a9c81a156949f64d1dc355c9064a568c7b920f07ce7b0fedf59efca987ccc00741609f51e50a4bde7e3ff4c6a8375f3f9a4a7ce42917aa1057bc57
(phoenix-queryserver) annotated tag python-phoenixdb-1.2.2.rc1 updated (db3aa25 -> f4e0187)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to annotated tag python-phoenixdb-1.2.2.rc1 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git *** WARNING: tag python-phoenixdb-1.2.2.rc1 was modified! *** from db3aa25 (commit) to f4e0187 (tag) tagging db3aa254741ffbcbf0427bd816426ce10c90b4e4 (commit) replaces python-phoenixdb-1.2.2.rc0 by Richard Antal on Tue Jun 4 14:27:34 2024 +0200 - Log - python-phoenixdb-1.2.2.rc1 --- No new revisions were added by this update. Summary of changes:
(phoenix-queryserver) branch master updated: PHOENIX-7312 Release PhoenixDB 1.2.2 rc1 (#154)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new db3aa25 PHOENIX-7312 Release PhoenixDB 1.2.2 rc1 (#154) db3aa25 is described below commit db3aa254741ffbcbf0427bd816426ce10c90b4e4 Author: richardantal AuthorDate: Tue Jun 4 14:20:26 2024 +0200 PHOENIX-7312 Release PhoenixDB 1.2.2 rc1 (#154) --- python-phoenixdb/NEWS.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-phoenixdb/NEWS.rst b/python-phoenixdb/NEWS.rst index 2433f80..f8b57c4 100644 --- a/python-phoenixdb/NEWS.rst +++ b/python-phoenixdb/NEWS.rst @@ -2,7 +2,7 @@ Changelog = Version 1.2.2 --- +- - Update python-phoenixdb/RELEASING.rst (PHOENIX-6820) - Crash Due to Unhandled JDBC Type Code 0 for NULL Values (PHOENIX-7246) - Manage requests-gssapi version for Phython 3.7 and lower (PHOENIX-7221) @@ -17,6 +17,7 @@ Version 1.2.2 - Add support for specifying custom HTTP headers (PHOENIX-6921) - Use JDBC/Avatica column label as column name when set (PHOENIX-6917) - Do not throw exception when shutting down Python with open connections (PHOENIX-6926) +- Fix twine check error and add a steps to Releasing guide (PHOENIX-7323) Version 1.2.1 -
(phoenix-queryserver) branch master updated: PHOENIX-7323 fix twine check error (#153)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new 21b1b35 PHOENIX-7323 fix twine check error (#153) 21b1b35 is described below commit 21b1b35923d148563c6844e66edb0ae4fa0f42bf Author: richardantal AuthorDate: Tue Jun 4 09:21:48 2024 +0200 PHOENIX-7323 fix twine check error (#153) --- python-phoenixdb/README.rst| 1 + python-phoenixdb/RELEASING.rst | 5 + python-phoenixdb/setup.py | 1 + 3 files changed, 7 insertions(+) diff --git a/python-phoenixdb/README.rst b/python-phoenixdb/README.rst index a8aa96c..1d70a6e 100644 --- a/python-phoenixdb/README.rst +++ b/python-phoenixdb/README.rst @@ -33,6 +33,7 @@ Extract the archive and then install it manually:: Note that old versions of pip and setuptools have various bugs and incompatibilities that may result in installation errors, especially on old python versions. If you encounter problems while building, update your pip and setuptools, and try again:: + pip install --upgrade pip pip install --upgrade setuptools diff --git a/python-phoenixdb/RELEASING.rst b/python-phoenixdb/RELEASING.rst index fb133f1..9963854 100644 --- a/python-phoenixdb/RELEASING.rst +++ b/python-phoenixdb/RELEASING.rst @@ -25,6 +25,11 @@ Prepare the RC #. Make sure the dockerized tests described in README.rst run successfully +#. Make sure to run twine check on the phoenixdb package files for python 2 and 3 and ensure they pass: + +python setup.py sdist bdist_wheel +twine check dist/* + #. Discuss release plans on dev@phoenix.a.o #. Open a ticket like https://issues.apache.org/jira/browse/PHOENIX-6529 diff --git a/python-phoenixdb/setup.py b/python-phoenixdb/setup.py index 38b53f8..88bc693 100644 --- a/python-phoenixdb/setup.py +++ b/python-phoenixdb/setup.py @@ -67,6 +67,7 @@ setup( name="phoenixdb", version=version, description="Phoenix database adapter for Python", +long_description_content_type="text/x-rst", long_description=readme(), author="Apache Software Foundation", author_email="d...@phoenix.apache.org",
svn commit: r69090 - in /dev/phoenix/python-phoenixdb-1.2.2.rc0: ./ src/ src/python-phoenixdb-1.2.2-src.tar.gz src/python-phoenixdb-1.2.2-src.tar.gz.asc src/python-phoenixdb-1.2.2-src.tar.gz.sha512
Author: richardantal Date: Fri May 10 12:31:20 2024 New Revision: 69090 Log: PHOENIX-7312 Release PhoenixDB 1.2.2 Added: dev/phoenix/python-phoenixdb-1.2.2.rc0/ dev/phoenix/python-phoenixdb-1.2.2.rc0/src/ dev/phoenix/python-phoenixdb-1.2.2.rc0/src/python-phoenixdb-1.2.2-src.tar.gz (with props) dev/phoenix/python-phoenixdb-1.2.2.rc0/src/python-phoenixdb-1.2.2-src.tar.gz.asc dev/phoenix/python-phoenixdb-1.2.2.rc0/src/python-phoenixdb-1.2.2-src.tar.gz.sha512 Added: dev/phoenix/python-phoenixdb-1.2.2.rc0/src/python-phoenixdb-1.2.2-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/python-phoenixdb-1.2.2.rc0/src/python-phoenixdb-1.2.2-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/python-phoenixdb-1.2.2.rc0/src/python-phoenixdb-1.2.2-src.tar.gz.asc == --- dev/phoenix/python-phoenixdb-1.2.2.rc0/src/python-phoenixdb-1.2.2-src.tar.gz.asc (added) +++ dev/phoenix/python-phoenixdb-1.2.2.rc0/src/python-phoenixdb-1.2.2-src.tar.gz.asc Fri May 10 12:31:20 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEeBOGKoWvu7T+ccyV57h6o/+o7a0FAmY+B9cACgkQ57h6o/+o +7a1ANA/+Lt9aUNbwED605P8P7rOsm3vQ1eWXo4zv2mryJMFYLtEpy7yR5Mf+Bc3b +Gx76QRtAI7+ny8WBi9rjETCVSl+GEwXh+TcYxAnd1H0spsTZ3mWajOlHXKIb6rXs +VH9O2bfSIVgGlkqzEqaoQvVmg2wXNx1F8xVDb3X1QSYn1bhNZUGWmTFSG0f4WsQz +u24NM1T7FGXoV5xu3RHL24QFIEa8i0jU2BqPty5pTUABXPLFXTMdGLu89WY01xrY +Kjc/M00qUS3/DoerwcaPHLicivWHISwJeif+ZAXafnrOIPvZkWhU6WY8cS/prq7o +h+AL90xQlgN32K6LGZ+WEdfCyACaSZNuXW7rLRyJx+ccUqA/M9QAAcF7qlnjqake +/m9MbmIAFQEyy0yuK5RIaEft0sLT/sq4KpJv59DUc0xmDiec3r+kGHcs42c4pwrJ +RO6dStVikKyAsO/TjPPFiv5rWZwHfu+DxzbGJSqIiaTdHkSpr8xPbQ8iRsanRbkN +yMsvNSxdIGx8tsGYE4494cb6f/2lZBsjSAODoOfd2XA4DHUsNShiKipnQ51hCdU0 +OhvAKrjzZr+RzSItZ+4cF1wot8yrhbqCNPloDLgNa/Lcqz2wxDBs2U9QD8gdWnyA +wtFrgzZfCu/KCbKudNplKi+j+/gglJ3J7fl8MvPblsl6q5PqV7A= +=ytWf +-END PGP SIGNATURE- Added: dev/phoenix/python-phoenixdb-1.2.2.rc0/src/python-phoenixdb-1.2.2-src.tar.gz.sha512 == --- dev/phoenix/python-phoenixdb-1.2.2.rc0/src/python-phoenixdb-1.2.2-src.tar.gz.sha512 (added) +++ dev/phoenix/python-phoenixdb-1.2.2.rc0/src/python-phoenixdb-1.2.2-src.tar.gz.sha512 Fri May 10 12:31:20 2024 @@ -0,0 +1 @@ +SHA2-512(python-phoenixdb-1.2.2-src.tar.gz)= ed79b27052d21f7bcc16efebdcefdfd71acd55430de53eb1b3ab5787db4acc512de27274bf23fa21611402d4c2987d83bf7018f5952c164b11c15a36c2955ad8
(phoenix-queryserver) annotated tag python-phoenixdb-1.2.2.rc0 updated (b1c2d2c -> b4d2212)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to annotated tag python-phoenixdb-1.2.2.rc0 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git *** WARNING: tag python-phoenixdb-1.2.2.rc0 was modified! *** from b1c2d2c (commit) to b4d2212 (tag) tagging b1c2d2c5a24bdc8141570d3b626bd4cf1bae6e5b (commit) replaces python-phoenixdb-1.2.1 by Richard Antal on Fri May 10 13:43:01 2024 +0200 - Log - python-phoenixdb-1.2.2.rc0 --- No new revisions were added by this update. Summary of changes:
(phoenix-queryserver) branch master updated: PHOENIX-7312 Release PhoenixDB 1.2.2 (#152)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new b1c2d2c PHOENIX-7312 Release PhoenixDB 1.2.2 (#152) b1c2d2c is described below commit b1c2d2c5a24bdc8141570d3b626bd4cf1bae6e5b Author: richardantal AuthorDate: Thu May 9 09:40:39 2024 +0200 PHOENIX-7312 Release PhoenixDB 1.2.2 (#152) --- python-phoenixdb/NEWS.rst | 5 - python-phoenixdb/setup.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-phoenixdb/NEWS.rst b/python-phoenixdb/NEWS.rst index 59824c9..2433f80 100644 --- a/python-phoenixdb/NEWS.rst +++ b/python-phoenixdb/NEWS.rst @@ -1,10 +1,13 @@ Changelog = -Unreleased +Version 1.2.2 -- - Update python-phoenixdb/RELEASING.rst (PHOENIX-6820) +- Crash Due to Unhandled JDBC Type Code 0 for NULL Values (PHOENIX-7246) +- Manage requests-gssapi version for Phython 3.7 and lower (PHOENIX-7221) - Add Python 3.11 to supported languages and update docker test image for phoenixdb (PHOENIX-6858) +- Add Python 3.12 to supported versions and the test matrix (PHOENIX-7222) - Document workaround for PhoenixDB 1.2+ not working with Python2 on some systems (PHOENIX-6863) - Update install instructions in README.rst (PHOENIX-6812) - Add support for SQLAlchemy 2.0 (PHOENIX-6892) diff --git a/python-phoenixdb/setup.py b/python-phoenixdb/setup.py index 36a33f5..38b53f8 100644 --- a/python-phoenixdb/setup.py +++ b/python-phoenixdb/setup.py @@ -61,7 +61,7 @@ else: 'Sphinx;python_version>="3.6"', ], -version = "1.2.2.dev0" +version = "1.2.2" setup( name="phoenixdb",
(phoenix) branch master updated (d331a15bfd -> d0839b97e1)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git from d331a15bfd PHOENIX-7138 Import netty-bom to make sure all netty 4.1 modules share the same version add d0839b97e1 PHOENIX-7179 Remove HBase 2.3 leftover files (#1795) No new revisions were added by this update. Summary of changes: phoenix-hbase-compat-2.3.0/pom.xml | 113 - .../phoenix/compat/hbase/CompatDelegateHTable.java | 37 --- .../compat/hbase/CompatOmidTransactionTable.java | 31 -- .../compat/hbase/CompatPhoenixRpcScheduler.java| 40 .../apache/phoenix/compat/hbase/CompatUtil.java| 77 -- .../compat/hbase/HbaseCompatCapabilities.java | 24 - .../hbase/ReplicationSinkCompatEndpoint.java | 37 --- 7 files changed, 359 deletions(-) delete mode 100644 phoenix-hbase-compat-2.3.0/pom.xml delete mode 100644 phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java delete mode 100644 phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java delete mode 100644 phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatPhoenixRpcScheduler.java delete mode 100644 phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatUtil.java delete mode 100644 phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java delete mode 100644 phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/ReplicationSinkCompatEndpoint.java
(phoenix) branch revert-1774-PHOENIX-7160 created (now 93e764ecbe)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch revert-1774-PHOENIX-7160 in repository https://gitbox.apache.org/repos/asf/phoenix.git at 93e764ecbe Revert "PHOENIX-7160 Change the TSO default port to be compatible with Omid 1.1.1 (#1774)" This branch includes the following new commits: new 93e764ecbe Revert "PHOENIX-7160 Change the TSO default port to be compatible with Omid 1.1.1 (#1774)" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(phoenix) 01/01: Revert "PHOENIX-7160 Change the TSO default port to be compatible with Omid 1.1.1 (#1774)"
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch revert-1774-PHOENIX-7160 in repository https://gitbox.apache.org/repos/asf/phoenix.git commit 93e764ecbe576f9b39d9517ee4917056367c6421 Author: richardantal AuthorDate: Wed Jan 3 09:50:13 2024 +0100 Revert "PHOENIX-7160 Change the TSO default port to be compatible with Omid 1.1.1 (#1774)" This reverts commit ed7871eb378507c9bfe5e06e6971f07431b2e8d8. --- bin/hbase-omid-client-config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/hbase-omid-client-config.yml b/bin/hbase-omid-client-config.yml index 2d451c436c..b3301d415d 100644 --- a/bin/hbase-omid-client-config.yml +++ b/bin/hbase-omid-client-config.yml @@ -14,10 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Omid TSO connection -# The default port from 54758 has changed to 24758 since Omid 1.1.1 +#Omid TSO connection connectionType: !!org.apache.omid.tso.client.OmidClientConfiguration$ConnType DIRECT -connectionString: "localhost:24758" +connectionString: "localhost:54758" # When Omid is working in High Availability mode, two or more replicas of the TSO server are running in primary/backup # mode. When a TSO server replica is elected as master, it publishes its address through ZK. In order to configure
[phoenix] branch master updated: PHOENIX-7000 Always schedule RenewLeaseTasks (#1642)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new 986a16d3f8 PHOENIX-7000 Always schedule RenewLeaseTasks (#1642) 986a16d3f8 is described below commit 986a16d3f803a92781cdfbb3bc64eb52ba90e38f Author: richardantal AuthorDate: Mon Jul 31 10:00:47 2023 +0200 PHOENIX-7000 Always schedule RenewLeaseTasks (#1642) --- .../java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 f89a69646d..3ae740c6d8 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 @@ -3626,7 +3626,6 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement + "before any other command"); } } -scheduleRenewLeaseTasks(); success = true; } catch (RetriableUpgradeException e) { // Set success to true and don't set the exception as an initializationException, @@ -3641,6 +3640,9 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement initializationException = new SQLException(e); } } finally { +if (success) { +scheduleRenewLeaseTasks(); +} try { if (!success && hConnectionEstablished) { closeConnection();
[phoenix] branch 5.1 updated: PHOENIX-6999 Point lookups fail with reverse scan (#1646)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new fa449378ce PHOENIX-6999 Point lookups fail with reverse scan (#1646) fa449378ce is described below commit fa449378cebe59bc3d85296e7594234452a5ee6e Author: Istvan Toth AuthorDate: Wed Jul 26 09:27:30 2023 +0200 PHOENIX-6999 Point lookups fail with reverse scan (#1646) --- .../org/apache/phoenix/end2end/BaseOrderByIT.java | 55 +- .../java/org/apache/phoenix/util/ScanUtil.java | 38 ++- 2 files changed, 58 insertions(+), 35 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOrderByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOrderByIT.java index b9de4ee2b7..a0ef9bdb72 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOrderByIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOrderByIT.java @@ -38,6 +38,7 @@ import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.Statement; import java.util.Properties; import org.apache.phoenix.compile.ExplainPlan; @@ -46,6 +47,8 @@ import org.apache.phoenix.jdbc.PhoenixPreparedStatement; import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryBuilder; +import org.apache.phoenix.util.SchemaUtil; +import org.apache.phoenix.util.TestUtil; import org.junit.Test; @@ -86,7 +89,6 @@ public abstract class BaseOrderByIT extends ParallelStatsDisabledIT { } } - @Test public void testDescMultiOrderByExpr() throws Exception { String tenantId = getOrganizationId(); @@ -996,4 +998,55 @@ public abstract class BaseOrderByIT extends ParallelStatsDisabledIT { } } +@Test +public void testPhoenix6999() throws Exception { +Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); +String tableName = "TBL_" + generateUniqueName(); +String descTableName = "TBL_" + generateUniqueName(); + +String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName); +String fullDescTableName = +SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, descTableName); + +try (Connection conn = DriverManager.getConnection(getUrl(), props); +Statement stmt = conn.createStatement()) { +conn.setAutoCommit(false); +String ddl = +"CREATE TABLE " + fullTableName ++ "(k1 varchar primary key, v1 varchar, v2 varchar)"; +stmt.execute(ddl); +ddl = +"CREATE TABLE " + fullDescTableName ++ "(k1 varchar primary key desc, v1 varchar, v2 varchar)"; +stmt.execute(ddl); +stmt.execute("upsert into " + fullTableName + " values ('a','a','a')"); +stmt.execute("upsert into " + fullTableName + " values ('b','b','b')"); +stmt.execute("upsert into " + fullTableName + " values ('c','c','c')"); +stmt.execute("upsert into " + fullDescTableName + " values ('a','a','a')"); +stmt.execute("upsert into " + fullDescTableName + " values ('b','b','b')"); +stmt.execute("upsert into " + fullDescTableName + " values ('c','c','c')"); +conn.commit(); + +String query = "SELECT * from " + fullTableName + " where k1='b' order by k1 asc"; +ResultSet rs = stmt.executeQuery(query); +assertTrue(rs.next()); +assertEquals("b", rs.getString(1)); + +query = "SELECT * from " + fullTableName + " where k1='b' order by k1 desc"; +rs = stmt.executeQuery(query); +assertTrue(rs.next()); +assertEquals("b", rs.getString(1)); + +query = "SELECT * from " + fullDescTableName + " where k1='b' order by k1 asc"; +rs = stmt.executeQuery(query); +assertTrue(rs.next()); +assertEquals("b", rs.getString(1)); + +query = "SELECT * from " + fullDescTableName + " where k1='b' order by k1 desc"; +rs = stmt.executeQuery(query); +assertTrue(rs.next()); +assertEquals("b", rs.getString(1)); +} +} + } \ No newline at end of file diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java b
[phoenix] branch master updated: PHOENIX-6999 Point lookups fail with reverse scan (#1646)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new 694f8444ce PHOENIX-6999 Point lookups fail with reverse scan (#1646) 694f8444ce is described below commit 694f8444ce3bd67e4fb0e2deb40a8d36f82dfd60 Author: Istvan Toth AuthorDate: Wed Jul 26 09:27:30 2023 +0200 PHOENIX-6999 Point lookups fail with reverse scan (#1646) --- .../org/apache/phoenix/end2end/BaseOrderByIT.java | 55 +- .../java/org/apache/phoenix/util/ScanUtil.java | 38 ++- 2 files changed, 58 insertions(+), 35 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOrderByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOrderByIT.java index b9de4ee2b7..a0ef9bdb72 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOrderByIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOrderByIT.java @@ -38,6 +38,7 @@ import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.Statement; import java.util.Properties; import org.apache.phoenix.compile.ExplainPlan; @@ -46,6 +47,8 @@ import org.apache.phoenix.jdbc.PhoenixPreparedStatement; import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.QueryBuilder; +import org.apache.phoenix.util.SchemaUtil; +import org.apache.phoenix.util.TestUtil; import org.junit.Test; @@ -86,7 +89,6 @@ public abstract class BaseOrderByIT extends ParallelStatsDisabledIT { } } - @Test public void testDescMultiOrderByExpr() throws Exception { String tenantId = getOrganizationId(); @@ -996,4 +998,55 @@ public abstract class BaseOrderByIT extends ParallelStatsDisabledIT { } } +@Test +public void testPhoenix6999() throws Exception { +Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); +String tableName = "TBL_" + generateUniqueName(); +String descTableName = "TBL_" + generateUniqueName(); + +String fullTableName = SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName); +String fullDescTableName = +SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, descTableName); + +try (Connection conn = DriverManager.getConnection(getUrl(), props); +Statement stmt = conn.createStatement()) { +conn.setAutoCommit(false); +String ddl = +"CREATE TABLE " + fullTableName ++ "(k1 varchar primary key, v1 varchar, v2 varchar)"; +stmt.execute(ddl); +ddl = +"CREATE TABLE " + fullDescTableName ++ "(k1 varchar primary key desc, v1 varchar, v2 varchar)"; +stmt.execute(ddl); +stmt.execute("upsert into " + fullTableName + " values ('a','a','a')"); +stmt.execute("upsert into " + fullTableName + " values ('b','b','b')"); +stmt.execute("upsert into " + fullTableName + " values ('c','c','c')"); +stmt.execute("upsert into " + fullDescTableName + " values ('a','a','a')"); +stmt.execute("upsert into " + fullDescTableName + " values ('b','b','b')"); +stmt.execute("upsert into " + fullDescTableName + " values ('c','c','c')"); +conn.commit(); + +String query = "SELECT * from " + fullTableName + " where k1='b' order by k1 asc"; +ResultSet rs = stmt.executeQuery(query); +assertTrue(rs.next()); +assertEquals("b", rs.getString(1)); + +query = "SELECT * from " + fullTableName + " where k1='b' order by k1 desc"; +rs = stmt.executeQuery(query); +assertTrue(rs.next()); +assertEquals("b", rs.getString(1)); + +query = "SELECT * from " + fullDescTableName + " where k1='b' order by k1 asc"; +rs = stmt.executeQuery(query); +assertTrue(rs.next()); +assertEquals("b", rs.getString(1)); + +query = "SELECT * from " + fullDescTableName + " where k1='b' order by k1 desc"; +rs = stmt.executeQuery(query); +assertTrue(rs.next()); +assertEquals("b", rs.getString(1)); +} +} + } \ No newline at end of file diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/Sc
[phoenix-omid] branch master updated (496fe39a -> 4d12ca06)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git from 496fe39a OMID-244 Upgrade SnakeYaml version to 2.0 (#136) add 4d12ca06 OMID-245 Add dependency management for Guava to use 32.1.1 (#137) No new revisions were added by this update. Summary of changes: pom.xml | 7 +++ 1 file changed, 7 insertions(+)
[phoenix-thirdparty] branch master updated: PHOENIX-6992 Upgrade Guava to 32.1.1 (#7)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-thirdparty.git The following commit(s) were added to refs/heads/master by this push: new 35fa36e PHOENIX-6992 Upgrade Guava to 32.1.1 (#7) 35fa36e is described below commit 35fa36e38897129920beb5c730c1dcfe6db7efaa Author: richardantal AuthorDate: Thu Jul 13 10:03:56 2023 +0200 PHOENIX-6992 Upgrade Guava to 32.1.1 (#7) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e849dce..c8d480d 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ org.apache.phoenix.thirdparty -31.0.1-android +32.1.1-android 1.5.0
[phoenix-omid] branch master updated (2cb0c140 -> 496fe39a)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git from 2cb0c140 OMID-242 Bump guice version to 5.1.0 to support JDK 17 (#132) add 496fe39a OMID-244 Upgrade SnakeYaml version to 2.0 (#136) No new revisions were added by this update. Summary of changes: common/src/main/java/org/apache/omid/YAMLUtils.java | 8 +++- pom.xml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-)
[phoenix-omid] branch master updated (95692829 -> 2cb0c140)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git from 95692829 OMID-241 Add logging to TSO server crash (#133) add 2cb0c140 OMID-242 Bump guice version to 5.1.0 to support JDK 17 (#132) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[phoenix-omid] branch master updated (26906021 -> 95692829)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git from 26906021 OMID-239 OMID TLS support (#129) add 95692829 OMID-241 Add logging to TSO server crash (#133) No new revisions were added by this update. Summary of changes: tso-server/src/main/java/org/apache/omid/tso/TSOServer.java | 1 + 1 file changed, 1 insertion(+)
[phoenix-connectors] branch master updated (c3bb91a -> 7e3bc08)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git from c3bb91a PHOENIX-6937 Remove the connectors for Phoenix 4.x (#101) add 7e3bc08 PHOENIX-6957 Fix maven checkstyle configuration (#105) No new revisions were added by this update. Summary of changes: phoenix5-connectors-assembly/pom.xml| 4 + phoenix5-hive-shaded/pom.xml| 1 + phoenix5-hive/pom.xml | 1 + phoenix5-spark/pom.xml | 2 +- phoenix5-spark3-it/pom.xml | 1 + pom.xml | 17 +- src/main/config/checkstyle/checker.xml | 274 src/main/config/checkstyle/header.txt | 16 ++ src/main/config/checkstyle/suppressions.xml | 46 + 9 files changed, 352 insertions(+), 10 deletions(-) create mode 100644 src/main/config/checkstyle/checker.xml create mode 100644 src/main/config/checkstyle/header.txt create mode 100644 src/main/config/checkstyle/suppressions.xml
[phoenix-connectors] branch master updated (bcc3819 -> c3bb91a)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git from bcc3819 PHOENIX-6922 Javadoc failure while building connectors with Java 11 add c3bb91a PHOENIX-6937 Remove the connectors for Phoenix 4.x (#101) No new revisions were added by this update. Summary of changes: phoenix-connectors-phoenix4-compat/pom.xml | 55 -- .../java/org/apache/phoenix/compat/CompatUtil.java | 60 -- phoenix-connectors-phoenix5-compat/pom.xml | 62 --- .../java/org/apache/phoenix/compat/CompatUtil.java | 60 -- phoenix-flume-base/phoenix4-flume/pom.xml | 59 -- phoenix-flume-base/phoenix5-flume/pom.xml | 69 --- phoenix-hive-base/phoenix4-hive-shaded/pom.xml | 141 - phoenix-hive-base/phoenix4-hive/pom.xml| 126 - .../org/apache/phoenix/compat/HiveCompatUtil.java | 123 - .../java/org/apache/phoenix/compat/MyResult.java | 39 -- .../AbstractPhoenixObjectInspector.java| 59 -- .../PhoenixDateObjectInspectorBase.java| 65 --- .../PhoenixTimestampObjectInspectorBase.java | 62 --- phoenix-hive-base/phoenix5-hive-shaded/pom.xml | 209 --- phoenix-hive-base/phoenix5-hive/pom.xml| 176 -- phoenix-hive-base/pom.xml | 615 - phoenix-kafka-base/phoenix4-kafka/pom.xml | 67 --- phoenix-kafka-base/phoenix5-kafka/pom.xml | 78 --- phoenix-spark-base/phoenix4-spark-shaded/pom.xml | 80 --- phoenix-spark-base/phoenix4-spark/pom.xml | 67 --- phoenix-spark-base/phoenix5-spark-shaded/pom.xml | 90 --- phoenix-spark-base/phoenix5-spark/pom.xml | 77 --- phoenix4-connectors-assembly/pom.xml | 172 -- .../src/build/components/phoenix4-jars.xml | 59 -- .../package-phoenix4-connectors-to-tar-all.xml | 36 -- phoenix5-connectors-assembly/pom.xml | 23 +- .../src/build/components/phoenix5-jars.xml | 16 +- {phoenix-flume-base => phoenix5-flume}/pom.xml | 37 +- .../apache/phoenix/flume/CsvEventSerializerIT.java | 0 .../phoenix/flume/JsonEventSerializerIT.java | 0 .../org/apache/phoenix/flume/PhoenixSinkIT.java| 9 +- .../phoenix/flume/RegexEventSerializerIT.java | 0 .../phoenix/flume/serializer/CustomSerializer.java | 0 .../apache/phoenix/flume/sink/NullPhoenixSink.java | 0 .../apache/phoenix/flume/DefaultKeyGenerator.java | 0 .../org/apache/phoenix/flume/FlumeConstants.java | 0 .../org/apache/phoenix/flume/KeyGenerator.java | 0 .../org/apache/phoenix/flume/SchemaHandler.java| 0 .../flume/serializer/BaseEventSerializer.java | 0 .../flume/serializer/CsvEventSerializer.java | 0 .../phoenix/flume/serializer/EventSerializer.java | 0 .../phoenix/flume/serializer/EventSerializers.java | 0 .../flume/serializer/JsonEventSerializer.java | 0 .../flume/serializer/RegexEventSerializer.java | 0 .../org/apache/phoenix/flume/sink/PhoenixSink.java | 0 .../pom.xml| 300 -- phoenix5-hive/pom.xml | 482 .../hadoop/hive/ql/QTestProcessExecResult.java | 0 .../java/org/apache/hadoop/hive/ql/QTestUtil.java | 16 +- .../hive/ql/security/DummyAuthenticator.java | 0 .../phoenix/hive/BaseHivePhoenixStoreIT.java | 0 .../org/apache/phoenix/hive/HiveMapReduceIT.java | 0 .../apache/phoenix/hive/HivePhoenixStoreIT.java| 0 .../java/org/apache/phoenix/hive/HiveTestUtil.java | 0 .../it/java/org/apache/phoenix/hive/HiveTezIT.java | 0 .../org/apache/phoenix/compat/HiveCompatUtil.java | 0 .../java/org/apache/phoenix/compat/MyResult.java | 0 .../org/apache/phoenix/hive/PhoenixMetaHook.java | 0 .../apache/phoenix/hive/PhoenixRecordUpdater.java | 0 .../java/org/apache/phoenix/hive/PhoenixRow.java | 0 .../org/apache/phoenix/hive/PhoenixRowKey.java | 0 .../java/org/apache/phoenix/hive/PhoenixSerDe.java | 0 .../org/apache/phoenix/hive/PhoenixSerializer.java | 3 +- .../apache/phoenix/hive/PhoenixStorageHandler.java | 0 .../org/apache/phoenix/hive/PrimaryKeyData.java| 0 .../constants/PhoenixStorageHandlerConstants.java | 0 .../phoenix/hive/mapreduce/PhoenixInputFormat.java | 5 +- .../phoenix/hive/mapreduce/PhoenixInputSplit.java | 0 .../hive/mapreduce/PhoenixOutputFormat.java| 0 .../hive/mapreduce/PhoenixRecordReader.java| 0 .../hive/mapreduce/PhoenixRecordWriter.java| 0 .../hive/mapreduce/PhoenixResultWritable.java | 0 .../AbstractPhoenixObjectInspector.java| 0 .../PhoenixBinaryObjectInspector.java | 0 .../PhoenixBooleanObjectInspector.java | 0 .../PhoenixByteObjectInspector.j
[phoenix-omid] branch master updated (e927aa26 -> 26906021)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git from e927aa26 OMID-234 Bump SnakeYaml version to 1.33 (#127) add 26906021 OMID-239 OMID TLS support (#129) No new revisions were added by this update. Summary of changes: common/pom.xml | 47 ++ .../java/org/apache/omid/tls/KeyStoreFileType.java | 116 + .../java/org/apache/omid/tls/X509Exception.java| 76 +++ .../main/java/org/apache/omid/tls/X509Util.java| 286 .../omid/tls/BaseX509ParameterizedTestCase.java| 107 + .../org/apache/omid/tls/TestKeyStoreFileType.java | 110 + .../java/org/apache/omid/tls/TestX509Util.java | 378 +++ .../test/java/org/apache/omid/tls/X509KeyType.java | 18 +- .../java/org/apache/omid/tls/X509TestContext.java | 514 + .../java/org/apache/omid/tls/X509TestHelpers.java | 436 + pom.xml| 17 +- transaction-client/pom.xml | 25 + .../omid/tso/client/OmidClientConfiguration.java | 169 +++ .../java/org/apache/omid/tso/client/TSOClient.java | 50 ++ .../src/main/resources/omid-client-config.yml | 6 + .../apache/omid/tso/client/TestGetSslContext.java | 83 .../tso/client/TestOmidClientConfiguration.java| 27 ++ .../resources/tlstest-omid-client-config.yml} | 17 + tso-server/pom.xml | 19 + .../org/apache/omid/tso/TSOChannelHandler.java | 42 ++ .../java/org/apache/omid/tso/TSOServerConfig.java | 131 ++ .../default-omid-server-configuration.yml | 5 + .../org/apache/omid/tso/TSOServerConfigTest.java | 33 +- .../tso/client/TestTSOClientConnectionToTSO.java | 428 + .../resources/tlstest-omid-server-config.yml} | 17 + 25 files changed, 3148 insertions(+), 9 deletions(-) create mode 100644 common/src/main/java/org/apache/omid/tls/KeyStoreFileType.java create mode 100644 common/src/main/java/org/apache/omid/tls/X509Exception.java create mode 100644 common/src/main/java/org/apache/omid/tls/X509Util.java create mode 100644 common/src/test/java/org/apache/omid/tls/BaseX509ParameterizedTestCase.java create mode 100644 common/src/test/java/org/apache/omid/tls/TestKeyStoreFileType.java create mode 100644 common/src/test/java/org/apache/omid/tls/TestX509Util.java copy metrics/src/main/java/org/apache/omid/metrics/Gauge.java => common/src/test/java/org/apache/omid/tls/X509KeyType.java (63%) create mode 100644 common/src/test/java/org/apache/omid/tls/X509TestContext.java create mode 100644 common/src/test/java/org/apache/omid/tls/X509TestHelpers.java create mode 100644 transaction-client/src/test/java/org/apache/omid/tso/client/TestGetSslContext.java copy transaction-client/src/{main/resources/omid-client-config.yml => test/resources/tlstest-omid-client-config.yml} (81%) copy tso-server/src/{main/resources/default-omid-server-configuration.yml => test/resources/tlstest-omid-server-config.yml} (95%)
[phoenix-omid] branch master updated: OMID-234 Bump SnakeYaml version to 1.33 (#127)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git The following commit(s) were added to refs/heads/master by this push: new e927aa26 OMID-234 Bump SnakeYaml version to 1.33 (#127) e927aa26 is described below commit e927aa2605b3c75a78eb87fe16781eeca995479f Author: richardantal AuthorDate: Wed Feb 15 15:28:16 2023 +0100 OMID-234 Bump SnakeYaml version to 1.33 (#127) --- common/pom.xml | 1 - pom.xml| 9 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index bf1c09d0..86c8a26b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -63,7 +63,6 @@ org.yaml snakeyaml -${snakeyaml.version} commons-beanutils diff --git a/pom.xml b/pom.xml index c5bf548d..3b2a4100 100644 --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ 4.2.0 3.5.9 -1.30 +1.33 1.9.4 2.11.0 3.0.1 @@ -1071,6 +1071,13 @@ ${netty4.version} + + +org.yaml +snakeyaml +${snakeyaml.version} + +
[phoenix-queryserver] branch master updated: PHOENIX-6810 Make SSL key-store type configurable (#114)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new 4b22faa PHOENIX-6810 Make SSL key-store type configurable (#114) 4b22faa is described below commit 4b22faa55b5e35974951cc7f41b7e84eeba261dd Author: richardantal AuthorDate: Tue Jan 24 09:58:08 2023 +0100 PHOENIX-6810 Make SSL key-store type configurable (#114) and bump Avatica version to 1.23 --- .../java/org/apache/phoenix/queryserver/QueryServerProperties.java| 4 .../main/java/org/apache/phoenix/queryserver/server/QueryServer.java | 4 +++- pom.xml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerProperties.java b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerProperties.java index 9945da4..dda88cf 100644 --- a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerProperties.java +++ b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerProperties.java @@ -58,6 +58,10 @@ public class QueryServerProperties { "phoenix.queryserver.remoteUserExtractor.param"; public static final String QUERY_SERVER_DISABLE_KERBEROS_LOGIN = "phoenix.queryserver.disable.kerberos.login"; +public static final String QUERY_SERVER_TLS_KEYSTORE_TYPE_KEY = +"phoenix.queryserver.tls.keystore.type"; +public static final String QUERY_SERVER_TLS_KEYSTORE_TYPE_DEFAULT = +"jks"; public static final String QUERY_SERVER_TLS_ENABLED = "phoenix.queryserver.tls.enabled"; public static final String QUERY_SERVER_TLS_KEYSTORE = diff --git a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java index 45ead51..2add30e 100644 --- a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java +++ b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java @@ -284,6 +284,8 @@ public final class QueryServer extends Configured implements Tool, Runnable { final boolean useTls = getConf().getBoolean(QueryServerProperties.QUERY_SERVER_TLS_ENABLED, QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_ENABLED); if(useTls) { final String tlsKeystore = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE); + final String keystoreType = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE_TYPE_KEY, QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE_TYPE_DEFAULT); + final String tlsKeystorePassword = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE_PASSWORD, QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_KEYSTORE_PASSWORD); final String tlsTruststore = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_TRUSTSTORE); final String tlsTruststorePassword = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_TRUSTSTORE_PASSWORD, QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_TRUSTSTORE_PASSWORD); @@ -295,7 +297,7 @@ public final class QueryServer extends Configured implements Tool, Runnable { throw new Exception(String.format("if %s is enabled, %s must be specfified" , QueryServerProperties.QUERY_SERVER_TLS_ENABLED, QueryServerProperties.QUERY_SERVER_TLS_TRUSTSTORE)); } final File tlsTruststoreFile = new File(tlsTruststore); - builder.withTLS(tlsKeystoreFile, tlsKeystorePassword, tlsTruststoreFile, tlsTruststorePassword); + builder.withTLS(tlsKeystoreFile, tlsKeystorePassword, tlsTruststoreFile, tlsTruststorePassword, keystoreType); } } diff --git a/pom.xml b/pom.xml index b2d5ce9..740cbe3 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ 1.9.0 1.7.36 1.2.19 -1.21.0 +1.23.0 3.1.0 3.0.0
[phoenix-queryserver] branch master updated (b3af8ea -> 05d5eb0)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git from b3af8ea PHOENIX-6820 Update python-phoenixdb/RELEASING.rst (#111) add 05d5eb0 PHOENIX-6836: Enable code coverage reporting to SonarQube in Phoenix-Queryserver (#112) No new revisions were added by this update. Summary of changes: dev/code-coverage/README.md | 48 +++ dev/code-coverage/run-coverage.sh | 70 +++ pom.xml | 15 - 3 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 dev/code-coverage/README.md create mode 100755 dev/code-coverage/run-coverage.sh
[phoenix-queryserver] branch master updated: PHOENIX-6820 Update python-phoenixdb/RELEASING.rst (#111)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new b3af8ea PHOENIX-6820 Update python-phoenixdb/RELEASING.rst (#111) b3af8ea is described below commit b3af8ea39a065672c7f194c773be05094b729458 Author: richardantal AuthorDate: Tue Oct 25 17:25:22 2022 +0200 PHOENIX-6820 Update python-phoenixdb/RELEASING.rst (#111) --- python-phoenixdb/RELEASING.rst | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-phoenixdb/RELEASING.rst b/python-phoenixdb/RELEASING.rst index 400efb8..fb133f1 100644 --- a/python-phoenixdb/RELEASING.rst +++ b/python-phoenixdb/RELEASING.rst @@ -60,7 +60,10 @@ as an email template. Publishing -- -#. If the vote passes, upload the package to PyPI (using the instructions linked above) +#. If the vote passes, upload the package to PyPI (using the instructions linked above, and some extra notes here) +* Make sure to run the ``python setup.py sdist bdist_wheel`` with python 2 and 3 as well. +* To verify it you should have two ``.whl`` files under ``dist/`` folder +* ``pip install --index-url https://test.pypi.org/simple/ phoenixdb`` might not work for python2 because the test repo tends to miss the older versions of dependencies required for Python2. #. Bump the package version to ...dev0 in ``setup.py``, and commit the change
[phoenix-queryserver] branch master updated: PHOENIX-6819 Bump phoenixdb version to 1.2.2.dev0 after release (#110)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new e4e339c PHOENIX-6819 Bump phoenixdb version to 1.2.2.dev0 after release (#110) e4e339c is described below commit e4e339c4279cb9db9d9bb96c433a228e0527b953 Author: richardantal AuthorDate: Tue Oct 25 16:50:47 2022 +0200 PHOENIX-6819 Bump phoenixdb version to 1.2.2.dev0 after release (#110) --- python-phoenixdb/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-phoenixdb/setup.py b/python-phoenixdb/setup.py index 241b33c..749bc90 100644 --- a/python-phoenixdb/setup.py +++ b/python-phoenixdb/setup.py @@ -59,7 +59,7 @@ else: 'Sphinx;python_version>="3.6"', ], -version = "1.2.1" +version = "1.2.2.dev0" setup( name="phoenixdb",
svn commit: r1904823 - in /phoenix/site: publish/ publish/language/ source/src/site/markdown/
Author: richardantal Date: Tue Oct 25 08:28:40 2022 New Revision: 1904823 URL: http://svn.apache.org/viewvc?rev=1904823=rev Log: Update Phoenixdb on release page to 1.2.1 Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html phoenix/site/publish/array_type.html phoenix/site/publish/atomic_upsert.html phoenix/site/publish/building.html phoenix/site/publish/building_website.html phoenix/site/publish/bulk_dataload.html phoenix/site/publish/columnencoding.html phoenix/site/publish/contributing.html phoenix/site/publish/cursors.html phoenix/site/publish/develop.html phoenix/site/publish/download.html phoenix/site/publish/dynamic_columns.html phoenix/site/publish/explainplan.html phoenix/site/publish/faq.html phoenix/site/publish/flume.html phoenix/site/publish/hive_storage_handler.html phoenix/site/publish/index.html phoenix/site/publish/installation.html phoenix/site/publish/issues.html phoenix/site/publish/joins.html phoenix/site/publish/kafka.html phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/mailing_list.html phoenix/site/publish/metrics.html phoenix/site/publish/multi-tenancy.html phoenix/site/publish/namspace_mapping.html phoenix/site/publish/news.html phoenix/site/publish/omid.html phoenix/site/publish/paged.html phoenix/site/publish/performance.html phoenix/site/publish/pherf.html phoenix/site/publish/phoenix_mr.html phoenix/site/publish/phoenix_on_emr.html phoenix/site/publish/phoenix_orm.html phoenix/site/publish/phoenix_python.html phoenix/site/publish/phoenix_spark.html phoenix/site/publish/phoenixcon.html phoenix/site/publish/pig_integration.html phoenix/site/publish/python.html phoenix/site/publish/recent.html phoenix/site/publish/release.html phoenix/site/publish/release_notes.html phoenix/site/publish/resources.html phoenix/site/publish/roadmap.html phoenix/site/publish/rowtimestamp.html phoenix/site/publish/salted.html phoenix/site/publish/secondary_indexing.html phoenix/site/publish/sequences.html phoenix/site/publish/server.html phoenix/site/publish/skip_scan.html phoenix/site/publish/source.html phoenix/site/publish/subqueries.html phoenix/site/publish/tablesample.html phoenix/site/publish/team.html phoenix/site/publish/tech_talks.html phoenix/site/publish/tephra.html phoenix/site/publish/tracing.html phoenix/site/publish/transactions.html phoenix/site/publish/tuning.html phoenix/site/publish/tuning_guide.html phoenix/site/publish/udf.html phoenix/site/publish/update_statistics.html phoenix/site/publish/upgrading.html phoenix/site/publish/views.html phoenix/site/publish/who_is_using.html phoenix/site/source/src/site/markdown/download.md Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html?rev=1904823=1904822=1904823=diff == --- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original) +++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Tue Oct 25 08:28:40 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/array_type.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/array_type.html?rev=1904823=1904822=1904823=diff == --- phoenix/site/publish/array_type.html (original) +++ phoenix/site/publish/array_type.html Tue Oct 25 08:28:40 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/atomic_upsert.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/atomic_upsert.html?rev=1904823=1904822=1904823=diff == --- phoenix/site/publish/atomic_upsert.html (original) +++ phoenix/site/publish/atomic_upsert.html Tue Oct 25 08:28:40 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/building.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building.html?rev=1904823=1904822=1904823=diff == --- phoenix/site/publish/building.html (original) +++ phoenix/site/publish/building.html Tue Oct 25 08:28:40 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/building_website.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building_website.html?rev=1904823=1904822=1904823=diff == --- phoenix/site/publish/building_website.html (original) +++ phoenix/site/publish/building_website.html Tue Oct 25 08:28:40 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish
svn commit: r57579 - /dev/phoenix/python-phoenixdb-1.2.1.rc1/ /release/phoenix/python-phoenixdb-1.2.1/
Author: richardantal Date: Tue Oct 25 07:56:26 2022 New Revision: 57579 Log: Release python-phoenixdb-1.2.1.rc1 as python-phoenixdb-1.2.1 Added: release/phoenix/python-phoenixdb-1.2.1/ - copied from r57578, dev/phoenix/python-phoenixdb-1.2.1.rc1/ Removed: dev/phoenix/python-phoenixdb-1.2.1.rc1/
[phoenix-queryserver] annotated tag python-phoenixdb-1.2.1 updated (1c6842a -> 57b6250)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to annotated tag python-phoenixdb-1.2.1 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git *** WARNING: tag python-phoenixdb-1.2.1 was modified! *** from 1c6842a (commit) to 57b6250 (tag) tagging 1c6842a78b9b65be72d02780ac2c8221178a5713 (commit) replaces python-phoenixdb-1.2.1.rc0 by Richard Antal on Mon Oct 24 16:53:22 2022 +0200 - Log - python-phoenixdb-1.2.1 --- No new revisions were added by this update. Summary of changes:
svn commit: r1904695 - in /phoenix/site: publish/ publish/language/ source/src/site/markdown/
Author: richardantal Date: Wed Oct 19 13:24:06 2022 New Revision: 1904695 URL: http://svn.apache.org/viewvc?rev=1904695=rev Log: Updated the team page Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html phoenix/site/publish/array_type.html phoenix/site/publish/atomic_upsert.html phoenix/site/publish/building.html phoenix/site/publish/building_website.html phoenix/site/publish/bulk_dataload.html phoenix/site/publish/columnencoding.html phoenix/site/publish/contributing.html phoenix/site/publish/cursors.html phoenix/site/publish/develop.html phoenix/site/publish/download.html phoenix/site/publish/dynamic_columns.html phoenix/site/publish/explainplan.html phoenix/site/publish/faq.html phoenix/site/publish/flume.html phoenix/site/publish/hive_storage_handler.html phoenix/site/publish/index.html phoenix/site/publish/installation.html phoenix/site/publish/issues.html phoenix/site/publish/joins.html phoenix/site/publish/kafka.html phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/mailing_list.html phoenix/site/publish/metrics.html phoenix/site/publish/multi-tenancy.html phoenix/site/publish/namspace_mapping.html phoenix/site/publish/news.html phoenix/site/publish/omid.html phoenix/site/publish/paged.html phoenix/site/publish/performance.html phoenix/site/publish/pherf.html phoenix/site/publish/phoenix_mr.html phoenix/site/publish/phoenix_on_emr.html phoenix/site/publish/phoenix_orm.html phoenix/site/publish/phoenix_python.html phoenix/site/publish/phoenix_spark.html phoenix/site/publish/phoenixcon.html phoenix/site/publish/pig_integration.html phoenix/site/publish/python.html phoenix/site/publish/recent.html phoenix/site/publish/release.html phoenix/site/publish/release_notes.html phoenix/site/publish/resources.html phoenix/site/publish/roadmap.html phoenix/site/publish/rowtimestamp.html phoenix/site/publish/salted.html phoenix/site/publish/secondary_indexing.html phoenix/site/publish/sequences.html phoenix/site/publish/server.html phoenix/site/publish/skip_scan.html phoenix/site/publish/source.html phoenix/site/publish/subqueries.html phoenix/site/publish/tablesample.html phoenix/site/publish/team.html phoenix/site/publish/tech_talks.html phoenix/site/publish/tephra.html phoenix/site/publish/tracing.html phoenix/site/publish/transactions.html phoenix/site/publish/tuning.html phoenix/site/publish/tuning_guide.html phoenix/site/publish/udf.html phoenix/site/publish/update_statistics.html phoenix/site/publish/upgrading.html phoenix/site/publish/views.html phoenix/site/publish/who_is_using.html phoenix/site/source/src/site/markdown/team.md Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html?rev=1904695=1904694=1904695=diff == --- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original) +++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Wed Oct 19 13:24:06 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/array_type.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/array_type.html?rev=1904695=1904694=1904695=diff == --- phoenix/site/publish/array_type.html (original) +++ phoenix/site/publish/array_type.html Wed Oct 19 13:24:06 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/atomic_upsert.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/atomic_upsert.html?rev=1904695=1904694=1904695=diff == --- phoenix/site/publish/atomic_upsert.html (original) +++ phoenix/site/publish/atomic_upsert.html Wed Oct 19 13:24:06 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/building.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building.html?rev=1904695=1904694=1904695=diff == --- phoenix/site/publish/building.html (original) +++ phoenix/site/publish/building.html Wed Oct 19 13:24:06 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/building_website.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building_website.html?rev=1904695=1904694=1904695=diff == --- phoenix/site/publish/building_website.html (original) +++ phoenix/site/publish/building_website.html Wed Oct 19 13:24:06 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/bulk_dataload.html URL
svn commit: r57354 - in /dev/phoenix/python-phoenixdb-1.2.1.rc1: ./ src/ src/python-phoenixdb-1.2.1-src.tar.gz src/python-phoenixdb-1.2.1-src.tar.gz.asc src/python-phoenixdb-1.2.1-src.tar.gz.sha512
Author: richardantal Date: Thu Oct 13 12:21:52 2022 New Revision: 57354 Log: python-phoenixdb 1.2.1RC1 Added: dev/phoenix/python-phoenixdb-1.2.1.rc1/ dev/phoenix/python-phoenixdb-1.2.1.rc1/src/ dev/phoenix/python-phoenixdb-1.2.1.rc1/src/python-phoenixdb-1.2.1-src.tar.gz (with props) dev/phoenix/python-phoenixdb-1.2.1.rc1/src/python-phoenixdb-1.2.1-src.tar.gz.asc dev/phoenix/python-phoenixdb-1.2.1.rc1/src/python-phoenixdb-1.2.1-src.tar.gz.sha512 Added: dev/phoenix/python-phoenixdb-1.2.1.rc1/src/python-phoenixdb-1.2.1-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/python-phoenixdb-1.2.1.rc1/src/python-phoenixdb-1.2.1-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/python-phoenixdb-1.2.1.rc1/src/python-phoenixdb-1.2.1-src.tar.gz.asc == --- dev/phoenix/python-phoenixdb-1.2.1.rc1/src/python-phoenixdb-1.2.1-src.tar.gz.asc (added) +++ dev/phoenix/python-phoenixdb-1.2.1.rc1/src/python-phoenixdb-1.2.1-src.tar.gz.asc Thu Oct 13 12:21:52 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEeBOGKoWvu7T+ccyV57h6o/+o7a0FAmNIAVwACgkQ57h6o/+o +7a2rHw//RqTmIWmMm9cOTMW63raHKoUBiI1a/sDhPYo3p9tigrUxlBERmJOMWA8v +iVZ4zHd4jrheF8TzaXFCGOiQz1O2o+wU9ttrlkt/GMVZC4NtPp2JukFyoeul7Vsn +gpNVpVEu9e5VfDYmr1MfmTM7HInC0DiSnin4Jb4P8fxegYS1KjHmkruvRbOGaI1x +d/RdPzrTN7zQ+2w/15QlwBhqEbIJ+RBFJaiB+QdoxWsowCz4weBCK58imBbYOUZh +Kle56bv9U46qIHTThDsMVew8eigbjkDVyk2Tat/T4yhuIsI/3OzPuARTViullEmO +JqkVMolhCPsLYSZ6qtt95mm3K3OmGVUcn+CISi92Wd71n7cu77I0fRC5rDoz3e9W +i7IANfLGreMEWjpJejQubbpj32wHLRukXGi8OfiK8oZjrLD1uo9EH7wZmoBdRbgM +L4vTdmmJNkcunbndAY7eqcgJHy3q1ezJjARFkeLj3Ci8XbP1ND3+GgI4YvOUIbXN +rWs/IjVnxeidNIm3pN1uoRIO3eVFBMF8N62wuakkgjgjVMltVonmlTga+Wf6e3/4 +83MGb8C3r9AKnSEMpx32EIYPi/bM5iHmv5r2Yma53nRfFhPTi79v8FSWiA1Nzap3 +GtY4bIsPCN6o9Or4zG/jQSjjSJ9m6hdLRkqqcczGFNp+I/3l0uE= +=MvCa +-END PGP SIGNATURE- Added: dev/phoenix/python-phoenixdb-1.2.1.rc1/src/python-phoenixdb-1.2.1-src.tar.gz.sha512 == --- dev/phoenix/python-phoenixdb-1.2.1.rc1/src/python-phoenixdb-1.2.1-src.tar.gz.sha512 (added) +++ dev/phoenix/python-phoenixdb-1.2.1.rc1/src/python-phoenixdb-1.2.1-src.tar.gz.sha512 Thu Oct 13 12:21:52 2022 @@ -0,0 +1 @@ +SHA512(python-phoenixdb-1.2.1-src.tar.gz)= 7d5e95cc539dcdabf25333a612584c0226650e1c5d247dcb19589b281ef0aa5ed1f9d755d511d26f3e4c6ff486c3ed372e468cf93f177e2cbb5d24a3adc1eb3e
[phoenix-queryserver] annotated tag python-phoenixdb-1.2.1.rc1 updated (1c6842a -> acaad23)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to annotated tag python-phoenixdb-1.2.1.rc1 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git *** WARNING: tag python-phoenixdb-1.2.1.rc1 was modified! *** from 1c6842a (commit) to acaad23 (tag) tagging 1c6842a78b9b65be72d02780ac2c8221178a5713 (commit) replaces python-phoenixdb-1.2.1.rc0 by Richard Antal on Thu Oct 13 14:16:08 2022 +0200 - Log - python-phoenixdb-1.2.1.rc1 --- No new revisions were added by this update. Summary of changes:
[phoenix-queryserver] branch master updated: PHOENIX-6811 Re-add phoenixdb requirements (#109)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new 1c6842a PHOENIX-6811 Re-add phoenixdb requirements (#109) 1c6842a is described below commit 1c6842a78b9b65be72d02780ac2c8221178a5713 Author: richardantal AuthorDate: Thu Oct 13 14:03:01 2022 +0200 PHOENIX-6811 Re-add phoenixdb requirements (#109) --- python-phoenixdb/NEWS.rst | 1 + python-phoenixdb/requirements.txt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/python-phoenixdb/NEWS.rst b/python-phoenixdb/NEWS.rst index a9d195e..4639581 100644 --- a/python-phoenixdb/NEWS.rst +++ b/python-phoenixdb/NEWS.rst @@ -15,6 +15,7 @@ Version 1.2.0 - Fixed get_view_names() in SqlAlchemy driver (PHOENIX-6727) - Added supports_statement_cache attribute for SqlAlchemy dialect to avoid warnings (PHOENIX-6735) - Re-generated the protobuf Python files with protoc 3.19 from the Avatica 1.21 descriptors (PHOENIX-6731) +- Re-added phoenixdb requirements (PHOENIX-6811) - Dropped support for Python 3.4 (PHOENIX-6731) Version 1.1.0 diff --git a/python-phoenixdb/requirements.txt b/python-phoenixdb/requirements.txt index 8413cd7..3000b74 100644 --- a/python-phoenixdb/requirements.txt +++ b/python-phoenixdb/requirements.txt @@ -16,4 +16,6 @@ # specific language governing permissions and limitations # under the License. # -# requirements are defined in setup.py \ No newline at end of file +protobuf>=3.0.0 +requests +requests-gssapi \ No newline at end of file
svn commit: r57170 - /release/phoenix/KEYS
Author: richardantal Date: Tue Oct 4 17:04:51 2022 New Revision: 57170 Log: CODE SIGNING KEY Added by Richard Antal Modified: release/phoenix/KEYS Modified: release/phoenix/KEYS == --- release/phoenix/KEYS (original) +++ release/phoenix/KEYS Tue Oct 4 17:04:51 2022 @@ -1010,6 +1010,7 @@ uid [ultimate] Viraj Jasani sub rsa4096 2020-06-14 [E] sig B3D6C0B41C8ADFD5 2020-06-14 Viraj Jasani + -BEGIN PGP PUBLIC KEY BLOCK- mQINBF7l5tIBEAChjYMhTszZYBtF63at8cFjeUjyUENmb+tkN+uzf0v4Yi+vC75u @@ -1060,4 +1061,63 @@ NRVMirzwNpdHy4TmyCm6GjPUiyYSJ/kve1zv4Zgu YQbIeEAdg2ctspyjXgWj2XFLMUZgZ1PEiGjvtM08F9u2/EO8v2YHmj3rCoBz6eZb 1oGDCuQ94h17pxgEeXdjgaiC7mYpefv8oHZSzPGcBt6WNuIiDaHhhLE7EHL2 =Wasi --END PGP PUBLIC KEY BLOCK- \ No newline at end of file +-END PGP PUBLIC KEY BLOCK- +pub rsa4096 2022-10-04 [SC] + 7813862A85AFBBB4FE71CC95E7B87AA3FFA8EDAD +uid [ultimate] Richard Antal (CODE SIGNING KEY) +sig 3E7B87AA3FFA8EDAD 2022-10-04 Richard Antal (CODE SIGNING KEY) +sub rsa4096 2022-10-04 [E] +sig E7B87AA3FFA8EDAD 2022-10-04 Richard Antal (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBGM8PbYBEACxTZ+uL07+RLEqelCxkN8x/2o/X7B7UN6g9slp6NlYZYouKisH +Z252QDb478yln8sD+7NHeSsw6ehDNIZgkXJVqRTdFXg4NFNDK6Xtz4Jai0LbtZsH +jbMeiHnkImdVde9kC/k4IacPUGqsVa8+y7ZU5d6gP25Yr4/L07mqEjqsbPWW3eug +5MzW5j/4Dft5KC8/RbOIv3irDKgddlI4hzvjdRbAmRyQ6j1ygI5iGer9IyaxDWmu +WYUQwOQIOZnTaU9fFpE/7mpCTKp+lB3Zf31w2dEVjAtcjwD6hx69tTrfu7vB936h +wS6yRvmyls0NRcUX9L2+GWbHQ8HjKVP32rwCwZGWvOAhH9nqSRo04TuwGKLDRjnz +xKYk1ZzuBHDC5q/ozWTEGy4DENC9+IGM4mhWYb8P1QHXX11zrXX+UQRdBSEPKdBB +sqXzyVroFfcaJTzihhBo7Iq+YlAr6rFy3q+EZ7OprnuMEZRnEGm8xG2VJbBOpLSO +Qsd2JxCDKO4E89CGeq2xjy5aKRtcPvaSFWOrIbfRj0r6NDLg9aZ/QuRnPW3Cxv34 +UvoGHia2zCdkMJO3w0ehLUm7gNqLU2QXVfhr63YsQ8toYFWZTDK5ep3r8yGDpu5k +IMn94PPtFYcLcqCoZK4NwAq2fESXMn5VSXLXfK1dMwbF0e6OXTItFW5DLwARAQAB +tDpSaWNoYXJkIEFudGFsIChDT0RFIFNJR05JTkcgS0VZKSA8cmljaGFyZGFudGFs +QGFwYWNoZS5vcmc+iQJRBBMBCAA7FiEEeBOGKoWvu7T+ccyV57h6o/+o7a0FAmM8 +PbYCGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQ57h6o/+o7a2fHxAA +oHEedvggg08li1yYgNBdcGhYmi04r5u2urlARW6oDFGRHy+7fcmJpVJbi3o9qngm +qlnar4D/+rF5/N6SkJ8bkZeWKskI0dHRnGGGnkH0wTjTmg7rF5R2iLDWPLNLP9Tb ++JQCMwO9GtGQiFMut3ZWBlAmxmzgSKUi2CLi86cGIWwSYz7NpARx5zGtTCcOVbN4 +mmOjQgVJlgFJLSB6tfTw0h9V16C+gtCZtFxAt5VeV9yFbhVMp/y3TVPmZmyUjwlL +YtlN+5TkXaVqWrMoMj0dTTq6g2NM6z34YXSZAQEl4OSUbs3KhCAy4yX7DeSkc51r +yQh76GrT0vND1h0/BxLWzP/F/1L9xp4gAlB6BBmzCajV/Ky35OL4dWDiFST5Qonl +zR8ALwSh9aFlT5/OwH7/jeS5rSXleGmFLaFdAQUhUEnOWN162eDX/8Y3oSEiVwco +Ywdf/08FoLlmj+GAZRyatdf2dDb88e4Wh9p0hlJCzth7nY+IFgNi8RTQQab44wwM +5Ml14H/CJ+OayrsHHbgKBYATSjju9Xc9INVyUR7nI1QlgyRiOHqfpdLyHE8drRhy +BwEcvoTy92HviqIf9o0eP8P1dqYymDgwCd3N0za+FxZk6Zd0JjgZA7+S9LPzA3ks +U3OFAUQfuMceG6CeZxhNEFAUTM8ViX/1Bt1Dg3yR5vW5Ag0EYzw9tgEQAK4wiOqb +IFAV1er+ldfuDhjTGKEb7yghJxXf/BEZrrGQst04eZGgNaHZ7yVUhQaQrLCIxwGS +cJKLYNN7TCF8LtnmB/94Q+GaDPbJQq739DnWSDU7ToKVy33Ka3Nzby4NMLtI7Jq2 +izVuqrupJyPsDBiu3UcPyTgYxNxayYtoOJtG3mDmIQ7zPMW/NFUEZQ+JYF+oKpud +NK8+y2Ls+omSK8FStAyME0IRo1J5w6GumPIQXp83lm0F65g1uEBnr6C2HatmRVg7 +lK3JRqgus5WXvv2t30LEcwZ5Bi2AwnhVzAGR3SbymbbOtvQbAP8vVjHSsICKutsU +xfrMmCE9dsQOeQDhBWj0BHfB6fRMnZoG5fjNu+GTrytxlp61lUbzMI5+V8K9Kbum +CGkoQWW31JhO+LOgl2v081eL2bTFDntaM5JY4La1hcvaIOPAxa8YlkRkOBlZP0pe +9biOegfxF5+AF43pJqueUKce+UzxEAI1JwWiXP+RsBu/i6/yKBtmmR8I9Tan0+xZ +PL/HofTBZ11bgXwaE+4aCJPpfyGloa4cojR8BOh3wQvtjFyLSOOeVYaKdExQ8cNa +42mKBDlNGNHUDJoI+5BPXO0bfWh9zAZWrs4p86ykktRYCjKxLsP+badrYR7K9e00 +hw+cSZZXvZQaFN2f2Ckq8k7Cq7idRFjwpTnpABEBAAGJAjYEGAEIACAWIQR4E4Yq +ha+7tP5xzJXnuHqj/6jtrQUCYzw9tgIbDAAKCRDnuHqj/6jtrQc7D/9J0Mx4Pnvk +/K0uUPBVmlIeZ8K/U2b3agCAKZbjKSgT0SGLghVCOC8oRrkagc8eoBe76DqH5fFj +N/2hlav6cF0dB2ej5dcr4k0trkrNbg/hDRUfNFKZjPylqfiuOIpC1KcXiK3Tusgn +0NCDLlCJAbGXMSEFp8quf8m4/286fPe+aK6HzyDmwZ3w+3a4Waq/1X7hJ0Ja0Nn7 +gIbDuYweCm3edE800swHstOge4J9nmAD1dXnUbaDm6bsS+wH7ZFSi1gF1kyVsRMT +K4JmO85/Hq/ueLX1YQDQoIzkcy/wPCO5UxX6euSwWHNBkC54yI70FNI5Ga0DbXZG +AFDnKvifg3j0GTB1gc4+kZ7ZP+P9/D5MNhD0xZq+3m0YjODpu4TgOa/p2Qy3h4uQ +E+079aGn8YAmCQXm9clcO5zgmNGHR/qa+sHbal0FM4HxKU3/c/MkUd9FZpg494Dg +FINV9TdDtmOpzIYEMnkVsy90NgTbd9wglpg5OtO+LaLvnhaYObsXX0uM/NzqiHvr +/Ke9tBVRBAInwHA3AtPhRqAq481/R/uZBzIIxoJh26TUlfj3OpLjzm4/8Bsvb+VU +Ds1hT77g8WJn6nlwn27pq0sJedxmHl+ScuSY43BCwxEuLvX3v23Lli4o/ZxrW9H9 +pod2wURNhbyqEC0zwK/X5ju9JKlZJW2PDA== +=vEKr +-END PGP PUBLIC KEY BLOCK-
svn commit: r57169 - in /dev/phoenix/python-phoenixdb-1.2.1.rc0: ./ src/ src/python-phoenixdb-1.2.1-src.tar.gz src/python-phoenixdb-1.2.1-src.tar.gz.asc src/python-phoenixdb-1.2.1-src.tar.gz.sha512
Author: richardantal Date: Tue Oct 4 16:23:18 2022 New Revision: 57169 Log: python-phoenixdb 1.2.1RC0 Added: dev/phoenix/python-phoenixdb-1.2.1.rc0/ dev/phoenix/python-phoenixdb-1.2.1.rc0/src/ dev/phoenix/python-phoenixdb-1.2.1.rc0/src/python-phoenixdb-1.2.1-src.tar.gz (with props) dev/phoenix/python-phoenixdb-1.2.1.rc0/src/python-phoenixdb-1.2.1-src.tar.gz.asc dev/phoenix/python-phoenixdb-1.2.1.rc0/src/python-phoenixdb-1.2.1-src.tar.gz.sha512 Added: dev/phoenix/python-phoenixdb-1.2.1.rc0/src/python-phoenixdb-1.2.1-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/python-phoenixdb-1.2.1.rc0/src/python-phoenixdb-1.2.1-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/python-phoenixdb-1.2.1.rc0/src/python-phoenixdb-1.2.1-src.tar.gz.asc == --- dev/phoenix/python-phoenixdb-1.2.1.rc0/src/python-phoenixdb-1.2.1-src.tar.gz.asc (added) +++ dev/phoenix/python-phoenixdb-1.2.1.rc0/src/python-phoenixdb-1.2.1-src.tar.gz.asc Tue Oct 4 16:23:18 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEeBOGKoWvu7T+ccyV57h6o/+o7a0FAmM8Rk4ACgkQ57h6o/+o +7a3meg//dOiulVK3b4fvN44mUOZN8TDtEC0zZjE/fkLJO1RabHU4JkEGDy9nqkIq +8U7iWuyme3iQMpT3d1cO72J99E/2Q05bj6bo7/koreiDXi2d70wkAde4fKNMEo4V +38ro8ySsJgoOYZ/JMVgi6kILlW5dFq75WBVp/Ro5K/PSB82JNrCGj5aVSoWPZPlV +D0JbKZulK+l9Bb0fL2aGEwWIYgJld2BcnYF04IHHzjKg7Ipbcr7hEyhuU6MVTtiK +ZmiJ2ftqspA7nRqIUrxKYvP+3lbgOO1rVVTWpjt+EZ17nOZ2dE9GdX6JFqIxC6on +FW/dYGvHbhzC2tmJVkxRU50HfQX1P+20agAuKluJwAmlkdC6bRIA4FrU7kqZJhUi +tUuc3ff3yLkkz23y76/5Pd/4W1SiJXv1yR3wjsNcT/LFqlsxTmPsFqM0rB6Bb6i0 +06fljjTpMnOMuj84Rdn5RWrLln+4u/ZOBuX5y3Bphmtxi+UJkEh37PT0Zn7aPuw8 +yOKQjuvqHOu5wQoZ2r5rdembbXHf0UaaVmHENCP5+rPM7zugYpXmM18yprFoERVy +9PDc/Q8zgmO8DENwbsxaVg6++KxvRJzooxfezTM2RySaBVIuOXi1OsUZOT/Vh0P6 +3IFL2hJmaVF2zn3QuX/HO6CK4awJEMdY0U6OWtrxND1Ch3iYax0= +=TobY +-END PGP SIGNATURE- Added: dev/phoenix/python-phoenixdb-1.2.1.rc0/src/python-phoenixdb-1.2.1-src.tar.gz.sha512 == --- dev/phoenix/python-phoenixdb-1.2.1.rc0/src/python-phoenixdb-1.2.1-src.tar.gz.sha512 (added) +++ dev/phoenix/python-phoenixdb-1.2.1.rc0/src/python-phoenixdb-1.2.1-src.tar.gz.sha512 Tue Oct 4 16:23:18 2022 @@ -0,0 +1 @@ +SHA512(python-phoenixdb-1.2.1-src.tar.gz)= dcd3abc1008e8f73dc00c29f31bf2c282028e4fe1fbf27cfc9d06682e7325a1ceebde4532ff0dc92f8a77a0fc83344f1e8b19e4fd08c1b8baed0022b84a9ea1d
svn commit: r57168 - /dev/phoenix/KEYS
Author: richardantal Date: Tue Oct 4 16:19:58 2022 New Revision: 57168 Log: CODE SIGNING KEY Added by Richard Antal Modified: dev/phoenix/KEYS Modified: dev/phoenix/KEYS == --- dev/phoenix/KEYS (original) +++ dev/phoenix/KEYS Tue Oct 4 16:19:58 2022 @@ -1061,4 +1061,63 @@ NRVMirzwNpdHy4TmyCm6GjPUiyYSJ/kve1zv4Zgu YQbIeEAdg2ctspyjXgWj2XFLMUZgZ1PEiGjvtM08F9u2/EO8v2YHmj3rCoBz6eZb 1oGDCuQ94h17pxgEeXdjgaiC7mYpefv8oHZSzPGcBt6WNuIiDaHhhLE7EHL2 =Wasi --END PGP PUBLIC KEY BLOCK- \ No newline at end of file +-END PGP PUBLIC KEY BLOCK- +pub rsa4096 2022-10-04 [SC] + 7813862A85AFBBB4FE71CC95E7B87AA3FFA8EDAD +uid [ultimate] Richard Antal (CODE SIGNING KEY) +sig 3E7B87AA3FFA8EDAD 2022-10-04 Richard Antal (CODE SIGNING KEY) +sub rsa4096 2022-10-04 [E] +sig E7B87AA3FFA8EDAD 2022-10-04 Richard Antal (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBGM8PbYBEACxTZ+uL07+RLEqelCxkN8x/2o/X7B7UN6g9slp6NlYZYouKisH +Z252QDb478yln8sD+7NHeSsw6ehDNIZgkXJVqRTdFXg4NFNDK6Xtz4Jai0LbtZsH +jbMeiHnkImdVde9kC/k4IacPUGqsVa8+y7ZU5d6gP25Yr4/L07mqEjqsbPWW3eug +5MzW5j/4Dft5KC8/RbOIv3irDKgddlI4hzvjdRbAmRyQ6j1ygI5iGer9IyaxDWmu +WYUQwOQIOZnTaU9fFpE/7mpCTKp+lB3Zf31w2dEVjAtcjwD6hx69tTrfu7vB936h +wS6yRvmyls0NRcUX9L2+GWbHQ8HjKVP32rwCwZGWvOAhH9nqSRo04TuwGKLDRjnz +xKYk1ZzuBHDC5q/ozWTEGy4DENC9+IGM4mhWYb8P1QHXX11zrXX+UQRdBSEPKdBB +sqXzyVroFfcaJTzihhBo7Iq+YlAr6rFy3q+EZ7OprnuMEZRnEGm8xG2VJbBOpLSO +Qsd2JxCDKO4E89CGeq2xjy5aKRtcPvaSFWOrIbfRj0r6NDLg9aZ/QuRnPW3Cxv34 +UvoGHia2zCdkMJO3w0ehLUm7gNqLU2QXVfhr63YsQ8toYFWZTDK5ep3r8yGDpu5k +IMn94PPtFYcLcqCoZK4NwAq2fESXMn5VSXLXfK1dMwbF0e6OXTItFW5DLwARAQAB +tDpSaWNoYXJkIEFudGFsIChDT0RFIFNJR05JTkcgS0VZKSA8cmljaGFyZGFudGFs +QGFwYWNoZS5vcmc+iQJRBBMBCAA7FiEEeBOGKoWvu7T+ccyV57h6o/+o7a0FAmM8 +PbYCGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4AACgkQ57h6o/+o7a2fHxAA +oHEedvggg08li1yYgNBdcGhYmi04r5u2urlARW6oDFGRHy+7fcmJpVJbi3o9qngm +qlnar4D/+rF5/N6SkJ8bkZeWKskI0dHRnGGGnkH0wTjTmg7rF5R2iLDWPLNLP9Tb ++JQCMwO9GtGQiFMut3ZWBlAmxmzgSKUi2CLi86cGIWwSYz7NpARx5zGtTCcOVbN4 +mmOjQgVJlgFJLSB6tfTw0h9V16C+gtCZtFxAt5VeV9yFbhVMp/y3TVPmZmyUjwlL +YtlN+5TkXaVqWrMoMj0dTTq6g2NM6z34YXSZAQEl4OSUbs3KhCAy4yX7DeSkc51r +yQh76GrT0vND1h0/BxLWzP/F/1L9xp4gAlB6BBmzCajV/Ky35OL4dWDiFST5Qonl +zR8ALwSh9aFlT5/OwH7/jeS5rSXleGmFLaFdAQUhUEnOWN162eDX/8Y3oSEiVwco +Ywdf/08FoLlmj+GAZRyatdf2dDb88e4Wh9p0hlJCzth7nY+IFgNi8RTQQab44wwM +5Ml14H/CJ+OayrsHHbgKBYATSjju9Xc9INVyUR7nI1QlgyRiOHqfpdLyHE8drRhy +BwEcvoTy92HviqIf9o0eP8P1dqYymDgwCd3N0za+FxZk6Zd0JjgZA7+S9LPzA3ks +U3OFAUQfuMceG6CeZxhNEFAUTM8ViX/1Bt1Dg3yR5vW5Ag0EYzw9tgEQAK4wiOqb +IFAV1er+ldfuDhjTGKEb7yghJxXf/BEZrrGQst04eZGgNaHZ7yVUhQaQrLCIxwGS +cJKLYNN7TCF8LtnmB/94Q+GaDPbJQq739DnWSDU7ToKVy33Ka3Nzby4NMLtI7Jq2 +izVuqrupJyPsDBiu3UcPyTgYxNxayYtoOJtG3mDmIQ7zPMW/NFUEZQ+JYF+oKpud +NK8+y2Ls+omSK8FStAyME0IRo1J5w6GumPIQXp83lm0F65g1uEBnr6C2HatmRVg7 +lK3JRqgus5WXvv2t30LEcwZ5Bi2AwnhVzAGR3SbymbbOtvQbAP8vVjHSsICKutsU +xfrMmCE9dsQOeQDhBWj0BHfB6fRMnZoG5fjNu+GTrytxlp61lUbzMI5+V8K9Kbum +CGkoQWW31JhO+LOgl2v081eL2bTFDntaM5JY4La1hcvaIOPAxa8YlkRkOBlZP0pe +9biOegfxF5+AF43pJqueUKce+UzxEAI1JwWiXP+RsBu/i6/yKBtmmR8I9Tan0+xZ +PL/HofTBZ11bgXwaE+4aCJPpfyGloa4cojR8BOh3wQvtjFyLSOOeVYaKdExQ8cNa +42mKBDlNGNHUDJoI+5BPXO0bfWh9zAZWrs4p86ykktRYCjKxLsP+badrYR7K9e00 +hw+cSZZXvZQaFN2f2Ckq8k7Cq7idRFjwpTnpABEBAAGJAjYEGAEIACAWIQR4E4Yq +ha+7tP5xzJXnuHqj/6jtrQUCYzw9tgIbDAAKCRDnuHqj/6jtrQc7D/9J0Mx4Pnvk +/K0uUPBVmlIeZ8K/U2b3agCAKZbjKSgT0SGLghVCOC8oRrkagc8eoBe76DqH5fFj +N/2hlav6cF0dB2ej5dcr4k0trkrNbg/hDRUfNFKZjPylqfiuOIpC1KcXiK3Tusgn +0NCDLlCJAbGXMSEFp8quf8m4/286fPe+aK6HzyDmwZ3w+3a4Waq/1X7hJ0Ja0Nn7 +gIbDuYweCm3edE800swHstOge4J9nmAD1dXnUbaDm6bsS+wH7ZFSi1gF1kyVsRMT +K4JmO85/Hq/ueLX1YQDQoIzkcy/wPCO5UxX6euSwWHNBkC54yI70FNI5Ga0DbXZG +AFDnKvifg3j0GTB1gc4+kZ7ZP+P9/D5MNhD0xZq+3m0YjODpu4TgOa/p2Qy3h4uQ +E+079aGn8YAmCQXm9clcO5zgmNGHR/qa+sHbal0FM4HxKU3/c/MkUd9FZpg494Dg +FINV9TdDtmOpzIYEMnkVsy90NgTbd9wglpg5OtO+LaLvnhaYObsXX0uM/NzqiHvr +/Ke9tBVRBAInwHA3AtPhRqAq481/R/uZBzIIxoJh26TUlfj3OpLjzm4/8Bsvb+VU +Ds1hT77g8WJn6nlwn27pq0sJedxmHl+ScuSY43BCwxEuLvX3v23Lli4o/ZxrW9H9 +pod2wURNhbyqEC0zwK/X5ju9JKlZJW2PDA== +=vEKr +-END PGP PUBLIC KEY BLOCK-
[phoenix-queryserver] annotated tag python-phoenixdb-1.2.1.rc0 updated (bcad14b -> ca728b3)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to annotated tag python-phoenixdb-1.2.1.rc0 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git *** WARNING: tag python-phoenixdb-1.2.1.rc0 was modified! *** from bcad14b (commit) to ca728b3 (tag) tagging bcad14bdfe4b3db5f123c201ef5f01d0f5bda9c0 (commit) replaces python-phoenixdb-1.2.0 by Richard Antal on Tue Oct 4 16:43:58 2022 +0200 - Log - python-phoenixdb-1.2.1.rc0 --- No new revisions were added by this update. Summary of changes:
[phoenix-queryserver] branch master updated: PHOENIX-6803 make_rc.sh does not work on mac (#108)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new bcad14b PHOENIX-6803 make_rc.sh does not work on mac (#108) bcad14b is described below commit bcad14bdfe4b3db5f123c201ef5f01d0f5bda9c0 Author: richardantal AuthorDate: Tue Oct 4 16:22:40 2022 +0200 PHOENIX-6803 make_rc.sh does not work on mac (#108) --- python-phoenixdb/NEWS.rst | 1 + python-phoenixdb/RELEASING.rst | 2 +- python-phoenixdb/dev-support/make_rc.sh | 8 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/python-phoenixdb/NEWS.rst b/python-phoenixdb/NEWS.rst index 8315636..a9d195e 100644 --- a/python-phoenixdb/NEWS.rst +++ b/python-phoenixdb/NEWS.rst @@ -5,6 +5,7 @@ Version 1.2.1 - - Defined authentication mechanism for SPNEGO explicitly (PHOENIX-6781) - Fixed failing docker build because of missing files (PHOENIX-6801) +- Fixed make_rc.sh script on mac (PHOENIX-6803) - Fixed flaky tests Version 1.2.0 diff --git a/python-phoenixdb/RELEASING.rst b/python-phoenixdb/RELEASING.rst index 8571018..400efb8 100644 --- a/python-phoenixdb/RELEASING.rst +++ b/python-phoenixdb/RELEASING.rst @@ -38,7 +38,7 @@ Prepare the RC #. Run the dev_support/make_rc.sh script, and choose the option to tag the release:: cd python-phoenixdb -./dev/support/make_rc.sh +./dev-support/make_rc.sh #. The distribution will be generated under the python-phoenixdb/release directory. Upload the directory to https://dist.apache.org/repos/dist/dev/phoenix/ with SVN:: diff --git a/python-phoenixdb/dev-support/make_rc.sh b/python-phoenixdb/dev-support/make_rc.sh index c1ece74..8024947 100755 --- a/python-phoenixdb/dev-support/make_rc.sh +++ b/python-phoenixdb/dev-support/make_rc.sh @@ -26,14 +26,14 @@ echo "Presumes that you can sign a release as described at https://www.apache.or echo "" echo "Continuing will overwrite all uncommitted changes under the phoenix-queryserver repository." -read -p "Y to continue or any other key to quit" prompt +read -p "Y to continue or any other key to quit " prompt if [[ ! $prompt =~ [yY](es)* ]] then echo "Aborting." exit fi -echo "Starting...";sleep 2s +echo "Starting...";sleep 2 # Set directory variables DIR_ROOT="$(cd $(dirname $0);pwd)/.." @@ -80,12 +80,12 @@ function_sign() { cd $DIR_REL_SRC_TAR_PATH; function_sign; # Tag -read -p "Do you want add tag for this RC in GIT? (Y for yes or any other key to continue)" prompt +read -p "Do you want add tag for this RC in GIT? (Y for yes or any other key to continue) " prompt if [[ $prompt =~ [yY](es)* ]] then echo "Tagging..." read -p "Enter tag (Example python-phoenixdb-1.0.0.rc0):" prompt - echo "Setting tag: $prompt";sleep 5s + echo "Setting tag: $prompt";sleep 5 git tag -a $prompt -m "$prompt"; git push origin $prompt mv $DIR_REL_ROOT $DIR_REL_BASE/$prompt fi
[phoenix-queryserver] branch master updated: PHOENIX-6801 Fix failing docker build because of missing files (#107)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new 17fed6b PHOENIX-6801 Fix failing docker build because of missing files (#107) 17fed6b is described below commit 17fed6b71346e6809d30a4ff45551fd508e1171a Author: richardantal AuthorDate: Tue Oct 4 10:35:03 2022 +0200 PHOENIX-6801 Fix failing docker build because of missing files (#107) --- python-phoenixdb/Dockerfile | 3 ++- python-phoenixdb/NEWS.rst | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/python-phoenixdb/Dockerfile b/python-phoenixdb/Dockerfile index 17eec6b..a6aea1c 100644 --- a/python-phoenixdb/Dockerfile +++ b/python-phoenixdb/Dockerfile @@ -26,7 +26,8 @@ RUN export RESOLVED_VERSIONS=`pyenv_resolve $BUILD_PYTHON_VERSIONS` \ && pyenv global $RESOLVED_VERSIONS $EXTRA_RESOLVED_VERSIONS \ && pyenv local --unset \ && python -m pip install -U tox \ - && apt-get install -y krb5-user libkrb5-dev +&& apt-get update \ +&& apt-get install -y krb5-user libkrb5-dev ENV PHOENIXDB_TEST_DB_URL=http://host.docker.internal:8765 ENV PHOENIXDB_TEST_DB_TRUSTSTORE= diff --git a/python-phoenixdb/NEWS.rst b/python-phoenixdb/NEWS.rst index a2dba44..8315636 100644 --- a/python-phoenixdb/NEWS.rst +++ b/python-phoenixdb/NEWS.rst @@ -4,6 +4,7 @@ Changelog Version 1.2.1 - - Defined authentication mechanism for SPNEGO explicitly (PHOENIX-6781) +- Fixed failing docker build because of missing files (PHOENIX-6801) - Fixed flaky tests Version 1.2.0
[phoenix-queryserver] branch master updated (0b11a1e -> 753bfed)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git from 0b11a1e PHOENIX-6750 Bump Avatica version to 1.21.0 in queryserver (#104) add 753bfed PHOENIX-6799 Release python-phoenixdb 1.2.1 (#106) No new revisions were added by this update. Summary of changes: python-phoenixdb/NEWS.rst | 5 + python-phoenixdb/setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
[phoenix-queryserver] branch master updated: PHOENIX-6750 Bump Avatica version to 1.21.0 in queryserver (#104)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new 0b11a1e PHOENIX-6750 Bump Avatica version to 1.21.0 in queryserver (#104) 0b11a1e is described below commit 0b11a1e46df5aaa2f7fe79d721530dc986153267 Author: richardantal AuthorDate: Tue Sep 6 10:32:44 2022 +0200 PHOENIX-6750 Bump Avatica version to 1.21.0 in queryserver (#104) --- .../org/apache/phoenix/queryserver/server/QueryServer.java | 10 ++ pom.xml| 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java index d39427a..45ead51 100644 --- a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java +++ b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java @@ -595,6 +595,16 @@ public final class QueryServer extends Configured implements Tool, Runnable { // Proxy this user on top of the server's user (the real user). Get a cached instance, the // LoadingCache will create a new instance for us if one isn't cached. + + // realm got removed from remoteUserName in CALCITE-4152 + // so we remove the instance name to avoid geting KerberosName$NoMatchingRule exception + + int atSignIndex = remoteUserName.indexOf('@'); + int separatorIndex = remoteUserName.indexOf('/'); + if (atSignIndex == -1 && separatorIndex > 0) { +remoteUserName = remoteUserName.substring(0, separatorIndex); + } + UserGroupInformation proxyUser = createProxyUser(remoteUserName); // Execute the actual call as this proxy user diff --git a/pom.xml b/pom.xml index a82c89a..091511b 100644 --- a/pom.xml +++ b/pom.xml @@ -80,13 +80,13 @@ 2.12.0 2.2.4 -9.4.43.v20210629 +9.4.46.v20220331 2.11.0 3.2.2 1.9.0 1.7.36 1.2.19 -1.19.0 +1.21.0 3.1.0 3.0.0
[phoenix-omid] branch master updated: OMID-189 Fix RAT check errors (#122)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git The following commit(s) were added to refs/heads/master by this push: new 059e51d5 OMID-189 Fix RAT check errors (#122) 059e51d5 is described below commit 059e51d5e4356c25db41604298f05387de8e93b3 Author: richardantal AuthorDate: Tue Sep 6 08:48:19 2022 +0200 OMID-189 Fix RAT check errors (#122) bintray-settings.xml deleted --- bintray-settings.xml | 9 - 1 file changed, 9 deletions(-) diff --git a/bintray-settings.xml b/bintray-settings.xml deleted file mode 100644 index 237d1b0d.. --- a/bintray-settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - -bintray -${env.BINTRAY_USER} -${env.BINTRAY_API_KEY} - - - \ No newline at end of file
[phoenix-queryserver] branch master updated: PHOENIX-6781 Fix flaky tests and define auch mech for SPNEGO explicitly (#105)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new c2f8db6 PHOENIX-6781 Fix flaky tests and define auch mech for SPNEGO explicitly (#105) c2f8db6 is described below commit c2f8db69ac8377accd9e686df44e5f5e14ed3022 Author: richardantal AuthorDate: Thu Sep 1 15:41:11 2022 +0200 PHOENIX-6781 Fix flaky tests and define auch mech for SPNEGO explicitly (#105) --- .../phoenix/end2end/SecureQueryServerPhoenixDBIT.java| 1 + python-phoenixdb/phoenixdb/__init__.py | 16 ++-- python-phoenixdb/phoenixdb/tests/test_db.py | 1 + python-phoenixdb/phoenixdb/tests/test_sqlalchemy.py | 2 ++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/SecureQueryServerPhoenixDBIT.java b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/SecureQueryServerPhoenixDBIT.java index 162285e..8ba86be 100644 --- a/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/SecureQueryServerPhoenixDBIT.java +++ b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/SecureQueryServerPhoenixDBIT.java @@ -204,6 +204,7 @@ public class SecureQueryServerPhoenixDBIT { checkForCommandOnPath("kinit"); final Configuration conf = UTIL.getConfiguration(); +conf.set("hbase.regionserver.wal.codec", "org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec"); // Ensure the dirs we need are created/empty ensureIsEmptyDirectory(TEMP_DIR); ensureIsEmptyDirectory(KEYTAB_DIR); diff --git a/python-phoenixdb/phoenixdb/__init__.py b/python-phoenixdb/phoenixdb/__init__.py index 93f47eb..44b4136 100644 --- a/python-phoenixdb/phoenixdb/__init__.py +++ b/python-phoenixdb/phoenixdb/__init__.py @@ -123,6 +123,14 @@ def connect(url, max_retries=None, auth=None, authentication=None, avatica_user= return Connection(client, **kwargs) +def _get_SPNEGOAuth(): +try: +spnego = gssapi.mechs.Mechanism.from_sasl_name("SPNEGO") +except AttributeError: +spnego = gssapi.OID.from_int_seq("1.3.6.1.5.5.2") +return HTTPSPNEGOAuth(opportunistic_auth=True, mech=spnego) + + def _process_args( url, auth=None, authentication=None, avatica_user=None, avatica_password=None, truststore=None, verify=None, do_as=None, user=None, password=None): @@ -176,14 +184,10 @@ def _process_args( if auth == "SPNEGO": # Special case for backwards compatibility -auth = HTTPSPNEGOAuth(opportunistic_auth=True) +auth = _get_SPNEGOAuth() elif auth is None and authentication is not None: if authentication == "SPNEGO": -try: -spnego = gssapi.mechs.Mechanism.from_sasl_name("SPNEGO") -except AttributeError: -spnego = gssapi.OID.from_int_seq("1.3.6.1.5.5.2") -auth = HTTPSPNEGOAuth(opportunistic_auth=True, mech=spnego) +auth = _get_SPNEGOAuth() elif authentication == "BASIC" and avatica_user is not None and avatica_password is not None: auth = HTTPBasicAuth(avatica_user, avatica_password) elif authentication == "DIGEST" and avatica_user is not None and avatica_password is not None: diff --git a/python-phoenixdb/phoenixdb/tests/test_db.py b/python-phoenixdb/phoenixdb/tests/test_db.py index 6b94ba8..82a1a65 100644 --- a/python-phoenixdb/phoenixdb/tests/test_db.py +++ b/python-phoenixdb/phoenixdb/tests/test_db.py @@ -125,6 +125,7 @@ class PhoenixDatabaseTest(DatabaseTestCase): def test_meta(self): with self.conn.cursor() as cursor: try: +cursor.execute('drop table if exists USERS') cursor.execute('drop table if exists DEFAULT_TABLE') cursor.execute('drop table if exists A_SCHEMA.A_TABLE') cursor.execute('drop table if exists B_SCHMEA.B_TABLE') diff --git a/python-phoenixdb/phoenixdb/tests/test_sqlalchemy.py b/python-phoenixdb/phoenixdb/tests/test_sqlalchemy.py index 82ebcc7..8fc9c9b 100644 --- a/python-phoenixdb/phoenixdb/tests/test_sqlalchemy.py +++ b/python-phoenixdb/phoenixdb/tests/test_sqlalchemy.py @@ -59,11 +59,13 @@ class SQLAlchemyTest(unittest.TestCase): try: inspector = db.inspect(engine) +connection.execute('drop table if exists USERS') connection.execute('drop table if exists ALCHEMY_TEST') connection.execute('drop table if exists A.ALCHEMY_TEST_A') connection.execute('drop table if exists B.ALCHEMY_TEST_B') self.assertE
[phoenix-omid] branch master updated: OMID-233 Fix license check (#121)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git The following commit(s) were added to refs/heads/master by this push: new da7ffb19 OMID-233 Fix license check (#121) da7ffb19 is described below commit da7ffb19429de58d81c824d63142e1d8db0d5829 Author: richardantal AuthorDate: Wed Aug 31 17:02:54 2022 +0200 OMID-233 Fix license check (#121) --- dev/code-coverage/run-coverage.sh | 24 +++- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dev/code-coverage/run-coverage.sh b/dev/code-coverage/run-coverage.sh index 7ed4b825..d22ba2bb 100755 --- a/dev/code-coverage/run-coverage.sh +++ b/dev/code-coverage/run-coverage.sh @@ -1,15 +1,21 @@ #!/usr/bin/env bash -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. usage() {
[phoenix-omid] branch master updated: PHOENIX-6775 Enable code coverage reporting to SonarQube in Phoenix-Omid (#116)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git The following commit(s) were added to refs/heads/master by this push: new 8da8c013 PHOENIX-6775 Enable code coverage reporting to SonarQube in Phoenix-Omid (#116) 8da8c013 is described below commit 8da8c013c4ebb87e320e32e900416ad41ba724b6 Author: Horváth Dóra AuthorDate: Tue Aug 30 17:17:45 2022 +0200 PHOENIX-6775 Enable code coverage reporting to SonarQube in Phoenix-Omid (#116) * PHOENIX-6775 Enable code coverage reporting to SonarQube in Phoenix-Omid --- dev/code-coverage/README.md | 40 ++ dev/code-coverage/run-coverage.sh | 72 +++ pom.xml | 55 ++ 3 files changed, 167 insertions(+) diff --git a/dev/code-coverage/README.md b/dev/code-coverage/README.md new file mode 100644 index ..a6c2d00f --- /dev/null +++ b/dev/code-coverage/README.md @@ -0,0 +1,40 @@ + + +# Clover code analysis + +The `run-coverage.sh` script runs maven with the code-coverage profile which generates +the clover code analysis data. +If the necessary parameters are given it also uploads the results to SonarQube. + +## Running code coverage + +The coverage results can be found under `target/clover/index.html` and here is how you can run the clover code analysis: + +```./dev/code-coverage/run-coverage.sh``` + +## Publishing coverage results to SonarQube + +The required parameters for publishing to SonarQube are: + +- host URL, +- login credentials, +- project key + +The project name is an optional parameter. + +Here is an example command for running and publishing the coverage data: + +`./dev/code-coverage/run-coverage.sh -l ProjectCredentials -u https://exampleserver.com +-k Project_Key -n Project_Name` \ No newline at end of file diff --git a/dev/code-coverage/run-coverage.sh b/dev/code-coverage/run-coverage.sh new file mode 100755 index ..7ed4b825 --- /dev/null +++ b/dev/code-coverage/run-coverage.sh @@ -0,0 +1,72 @@ +#!/usr/bin/env bash +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +usage() { + echo + echo "options:" + echo " -h Display help" + echo " -u SonarQube Host URL" + echo " -l SonarQube Login Credentials" + echo " -k SonarQube Project Key" + echo " -n SonarQube Project Name" + echo " -t Number of threads (example: 1 or 2C)." + echo + echo "Important:" + echo " The required parameters for publishing the coverage results to SonarQube:" + echo "- Host URL" + echo "- Login Credentials" + echo "- Project Key" + echo +} + +execute() { + SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" + MAIN_POM="${SCRIPT_DIR}/../../pom.xml" + # Check the syntax for the THREAD_COUNT variable + if [[ "$THREAD_COUNT" =~ ^[0-9]+([.][0-9]+)?$ ]] || [[ "$THREAD_COUNT" =~ ^[0-9]+([.][0-9]+)+[C]?$ ]]; then +THREADS="${THREAD_COUNT}" + else +THREADS=1 + fi + + mvn -B -e -Pcode-coverage -f "$MAIN_POM" clean install -Dparallel-tests -Dscale -fn -T "$THREADS" + mvn -B -e -Pcode-coverage -f "$MAIN_POM" clover:aggregate clover:clover -T "$THREADS" + + # If the required parameters are given, the code coverage results are uploaded to the SonarQube Server + if [ -n "$SONAR_LOGIN" ] && [ -n "$SONAR_PROJECT_KEY" ] && [ -n "$SONAR_URL" ]; then +mvn -B -e -Pcode-coverage -f "$MAIN_POM" sonar:sonar -Dsonar.projectName="$SONAR_PROJECT_NAME" \ + -Dsonar.host.url="$SONAR_URL" -Dsonar.login="$SONAR_LOGIN" -Dsonar.projectKey="$SONAR_PROJECT_KEY" -T "$THREADS" + fi +} + +while getopts ":u:l:k:n:t:h" option; do + case $option in + u) SONAR_URL=${OPTARG:-} ;; + l) SONAR_LOGIN=${OPTARG:-} ;; + k) SONAR_PROJECT_KEY=${OPTARG:-} ;; + n) SONAR_PROJECT_NAME=${OPTARG:-} ;; + t) THREAD_COUNT=${OPTARG:-} ;; + h) # Display usage +usage +exit +;; + \?) # Invalid option +
[phoenix] branch master updated (2c245f24d5 -> 98fc4c18e2)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git from 2c245f24d5 Revert "PHOENIX-6751 Force using range scan vs skip scan when using large IN clause" (#1492) add 98fc4c18e2 PHOENIX-6774 Enable code coverage reporting to SonarQube in Phoenix (#1491) No new revisions were added by this update. Summary of changes: dev/code-coverage/README.md | 48 dev/code-coverage/run-coverage.sh | 79 +++ pom.xml | 24 +++- 3 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 dev/code-coverage/README.md create mode 100755 dev/code-coverage/run-coverage.sh
[phoenix-connectors] branch master updated: PHOENIX-6770 set Log4j dependencies to provided (#87)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git The following commit(s) were added to refs/heads/master by this push: new 7e2c40f PHOENIX-6770 set Log4j dependencies to provided (#87) 7e2c40f is described below commit 7e2c40f672d6ee5203dc48fc9adf95e66eea6938 Author: richardantal <60829274+richardan...@users.noreply.github.com> AuthorDate: Wed Aug 17 09:42:17 2022 +0200 PHOENIX-6770 set Log4j dependencies to provided (#87) --- phoenix-hive-base/phoenix4-hive-shaded/pom.xml | 6 ++ phoenix-hive-base/phoenix5-hive-shaded/pom.xml | 6 ++ phoenix-pig-base/phoenix4-pig-shaded/pom.xml | 11 +++ phoenix-pig-base/phoenix5-pig-shaded/pom.xml | 11 +++ phoenix-spark-base/phoenix4-spark-shaded/pom.xml | 6 ++ phoenix-spark-base/phoenix5-spark-shaded/pom.xml | 6 ++ phoenix5-spark3-shaded/pom.xml | 5 + pom.xml | 5 + 8 files changed, 56 insertions(+) diff --git a/phoenix-hive-base/phoenix4-hive-shaded/pom.xml b/phoenix-hive-base/phoenix4-hive-shaded/pom.xml index b477449..1e301a5 100644 --- a/phoenix-hive-base/phoenix4-hive-shaded/pom.xml +++ b/phoenix-hive-base/phoenix4-hive-shaded/pom.xml @@ -103,6 +103,12 @@ adding the provided dependencies --> ${zookeeper.version} provided + + + log4j + log4j + provided + diff --git a/phoenix-hive-base/phoenix5-hive-shaded/pom.xml b/phoenix-hive-base/phoenix5-hive-shaded/pom.xml index 25996f7..67211e9 100644 --- a/phoenix-hive-base/phoenix5-hive-shaded/pom.xml +++ b/phoenix-hive-base/phoenix5-hive-shaded/pom.xml @@ -172,6 +172,12 @@ ${zookeeper.version} provided + + + log4j + log4j + provided + diff --git a/phoenix-pig-base/phoenix4-pig-shaded/pom.xml b/phoenix-pig-base/phoenix4-pig-shaded/pom.xml index 4ab1ddb..c825c9f 100644 --- a/phoenix-pig-base/phoenix4-pig-shaded/pom.xml +++ b/phoenix-pig-base/phoenix4-pig-shaded/pom.xml @@ -68,5 +68,16 @@ phoenix-hbase-compat-${hbase.compat.version} runtime + + + org.slf4j + slf4j-log4j12 + provided + + + log4j + log4j + provided + \ No newline at end of file diff --git a/phoenix-pig-base/phoenix5-pig-shaded/pom.xml b/phoenix-pig-base/phoenix5-pig-shaded/pom.xml index 675ea27..19e6845 100644 --- a/phoenix-pig-base/phoenix5-pig-shaded/pom.xml +++ b/phoenix-pig-base/phoenix5-pig-shaded/pom.xml @@ -79,6 +79,17 @@ phoenix-hbase-compat-${hbase.compat.version} runtime + + + org.slf4j + slf4j-log4j12 + provided + + + log4j + log4j + provided + \ No newline at end of file diff --git a/phoenix-spark-base/phoenix4-spark-shaded/pom.xml b/phoenix-spark-base/phoenix4-spark-shaded/pom.xml index 0d8561a..3bae294 100644 --- a/phoenix-spark-base/phoenix4-spark-shaded/pom.xml +++ b/phoenix-spark-base/phoenix4-spark-shaded/pom.xml @@ -42,6 +42,12 @@ phoenix-hbase-compat-${hbase.compat.version} runtime + + + log4j + log4j + provided + diff --git a/phoenix-spark-base/phoenix5-spark-shaded/pom.xml b/phoenix-spark-base/phoenix5-spark-shaded/pom.xml index 1b6c49c..5beddc0 100644 --- a/phoenix-spark-base/phoenix5-spark-shaded/pom.xml +++ b/phoenix-spark-base/phoenix5-spark-shaded/pom.xml @@ -52,6 +52,12 @@ phoenix-hbase-compat-${hbase.compat.version} runtime + + + log4j + log4j + provided + diff --git a/phoenix5-spark3-shaded/pom.xml b/phoenix5-spark3-shaded/pom.xml index 012b1ef..5e881d6 100644 --- a/phoenix5-spark3-shaded/pom.xml +++ b/phoenix5-spark3-shaded/pom.xml @@ -121,6 +121,11 @@ slf4j-log4j12 provided + + log4j + log4j + provided + diff --git a/pom.xml b/pom.xml index ab4e005..5da7f74 100644 --- a/pom.xml +++ b/pom.xml @@ -883,6 +883,11 @@ slf4j-log4j12 ${slf4j.version} + +log4j +log4j +${log4j.version} + org.apache.pig pig
[phoenix-connectors] 01/01: PHOENIX-6770 set Log4j dependencies to provided
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch PHOENIX-6770 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git commit 79eea1a7b058bbb33e44a0ac4b47056cfff4fa5b Author: Richard Antal AuthorDate: Tue Aug 16 18:43:43 2022 +0200 PHOENIX-6770 set Log4j dependencies to provided --- phoenix-hive-base/phoenix4-hive-shaded/pom.xml | 6 ++ phoenix-hive-base/phoenix5-hive-shaded/pom.xml | 6 ++ phoenix-pig-base/phoenix4-pig-shaded/pom.xml | 11 +++ phoenix-pig-base/phoenix5-pig-shaded/pom.xml | 11 +++ phoenix-spark-base/phoenix4-spark-shaded/pom.xml | 6 ++ phoenix-spark-base/phoenix5-spark-shaded/pom.xml | 6 ++ phoenix5-spark3-shaded/pom.xml | 5 + pom.xml | 5 + 8 files changed, 56 insertions(+) diff --git a/phoenix-hive-base/phoenix4-hive-shaded/pom.xml b/phoenix-hive-base/phoenix4-hive-shaded/pom.xml index b477449..1e301a5 100644 --- a/phoenix-hive-base/phoenix4-hive-shaded/pom.xml +++ b/phoenix-hive-base/phoenix4-hive-shaded/pom.xml @@ -103,6 +103,12 @@ adding the provided dependencies --> ${zookeeper.version} provided + + + log4j + log4j + provided + diff --git a/phoenix-hive-base/phoenix5-hive-shaded/pom.xml b/phoenix-hive-base/phoenix5-hive-shaded/pom.xml index 25996f7..67211e9 100644 --- a/phoenix-hive-base/phoenix5-hive-shaded/pom.xml +++ b/phoenix-hive-base/phoenix5-hive-shaded/pom.xml @@ -172,6 +172,12 @@ ${zookeeper.version} provided + + + log4j + log4j + provided + diff --git a/phoenix-pig-base/phoenix4-pig-shaded/pom.xml b/phoenix-pig-base/phoenix4-pig-shaded/pom.xml index 4ab1ddb..c825c9f 100644 --- a/phoenix-pig-base/phoenix4-pig-shaded/pom.xml +++ b/phoenix-pig-base/phoenix4-pig-shaded/pom.xml @@ -68,5 +68,16 @@ phoenix-hbase-compat-${hbase.compat.version} runtime + + + org.slf4j + slf4j-log4j12 + provided + + + log4j + log4j + provided + \ No newline at end of file diff --git a/phoenix-pig-base/phoenix5-pig-shaded/pom.xml b/phoenix-pig-base/phoenix5-pig-shaded/pom.xml index 675ea27..19e6845 100644 --- a/phoenix-pig-base/phoenix5-pig-shaded/pom.xml +++ b/phoenix-pig-base/phoenix5-pig-shaded/pom.xml @@ -79,6 +79,17 @@ phoenix-hbase-compat-${hbase.compat.version} runtime + + + org.slf4j + slf4j-log4j12 + provided + + + log4j + log4j + provided + \ No newline at end of file diff --git a/phoenix-spark-base/phoenix4-spark-shaded/pom.xml b/phoenix-spark-base/phoenix4-spark-shaded/pom.xml index 0d8561a..3bae294 100644 --- a/phoenix-spark-base/phoenix4-spark-shaded/pom.xml +++ b/phoenix-spark-base/phoenix4-spark-shaded/pom.xml @@ -42,6 +42,12 @@ phoenix-hbase-compat-${hbase.compat.version} runtime + + + log4j + log4j + provided + diff --git a/phoenix-spark-base/phoenix5-spark-shaded/pom.xml b/phoenix-spark-base/phoenix5-spark-shaded/pom.xml index 1b6c49c..5beddc0 100644 --- a/phoenix-spark-base/phoenix5-spark-shaded/pom.xml +++ b/phoenix-spark-base/phoenix5-spark-shaded/pom.xml @@ -52,6 +52,12 @@ phoenix-hbase-compat-${hbase.compat.version} runtime + + + log4j + log4j + provided + diff --git a/phoenix5-spark3-shaded/pom.xml b/phoenix5-spark3-shaded/pom.xml index 012b1ef..5e881d6 100644 --- a/phoenix5-spark3-shaded/pom.xml +++ b/phoenix5-spark3-shaded/pom.xml @@ -121,6 +121,11 @@ slf4j-log4j12 provided + + log4j + log4j + provided + diff --git a/pom.xml b/pom.xml index ab4e005..5da7f74 100644 --- a/pom.xml +++ b/pom.xml @@ -883,6 +883,11 @@ slf4j-log4j12 ${slf4j.version} + +log4j +log4j +${log4j.version} + org.apache.pig pig
[phoenix-connectors] branch PHOENIX-6770 created (now 79eea1a)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch PHOENIX-6770 in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git at 79eea1a PHOENIX-6770 set Log4j dependencies to provided This branch includes the following new commits: new 79eea1a PHOENIX-6770 set Log4j dependencies to provided The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[phoenix] branch 5.1 updated: PHOENIX-6653 Add upgrade tests based on HBase snapshots
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new 0ba34c74f3 PHOENIX-6653 Add upgrade tests based on HBase snapshots 0ba34c74f3 is described below commit 0ba34c74f341443c1ca54e77300b7828c4365c26 Author: Richard Antal AuthorDate: Mon Aug 15 16:26:20 2022 +0200 PHOENIX-6653 Add upgrade tests based on HBase snapshots --- phoenix-core/pom.xml | 5 ++ ...plateIT.java => LoadSystemTableSnapshotIT.java} | 86 + .../it/resources/snapshots4_7/snapshots47.tar.gz | Bin 0 -> 76288 bytes pom.xml| 6 ++ 4 files changed, 83 insertions(+), 14 deletions(-) diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 5969913fef..bf33f88a7c 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -494,6 +494,11 @@ org.apache.commons commons-csv + + org.apache.commons + commons-compress + test + org.apache.commons commons-lang3 diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SnapshotTestTemplateIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LoadSystemTableSnapshotIT.java similarity index 61% rename from phoenix-core/src/it/java/org/apache/phoenix/end2end/SnapshotTestTemplateIT.java rename to phoenix-core/src/it/java/org/apache/phoenix/end2end/LoadSystemTableSnapshotIT.java index 767baf2fe5..c8c0a95a99 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SnapshotTestTemplateIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/LoadSystemTableSnapshotIT.java @@ -20,27 +20,43 @@ package org.apache.phoenix.end2end; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; + +import java.io.File; import java.io.IOException; + +import java.net.URL; + import java.util.HashMap; + import java.util.Map; import java.util.Map.Entry; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; + import org.apache.hadoop.hbase.snapshot.ExportSnapshot; import org.apache.hadoop.hbase.util.CommonFSUtils; + import org.apache.phoenix.query.BaseTest; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; -import org.junit.Ignore; + import org.junit.Test; import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.commons.compress.archivers.tar.TarArchiveEntry; +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; +import org.apache.commons.compress.utils.IOUtils; + + +import java.io.FileInputStream; +import java.io.FileOutputStream; + /** * This is a not a standard IT. * It is starting point for writing ITs that load specific tables from a snapshot. @@ -49,19 +65,43 @@ import org.slf4j.LoggerFactory; * (or even being committed to the ASF branches) */ -@Ignore @Category(NeedsOwnMiniClusterTest.class) -public class SnapshotTestTemplateIT extends BaseTest { +public class LoadSystemTableSnapshotIT extends BaseTest { private static final Logger LOGGER = LoggerFactory.getLogger( -SnapshotTestTemplateIT.class); +LoadSystemTableSnapshotIT.class); + +public static final String SNAPSHOT_DIR = "snapshots4_7/"; +public static String rootDir; private static final HashMap SNAPSHOTS_TO_LOAD; +//private static final HashMap SNAPSHOTS_TO_RESTORE; static { SNAPSHOTS_TO_LOAD = new HashMap<>(); //Add any HBase tables, including Phoenix System tables -SNAPSHOTS_TO_LOAD.put("SYSTEM.CATALOG_SNAPSHOT", "/path/to/local/snapshot_dir"); + +SNAPSHOTS_TO_LOAD.put("SYSTEM.CATALOG_SNAPSHOT", "SYSTEM.CATALOG"); +SNAPSHOTS_TO_LOAD.put("SYSTEM.FUNCTION_SNAPSHOT", "SYSTEM.FUNCTION"); +SNAPSHOTS_TO_LOAD.put("SYSTEM.SEQUENCE_SNAPSHOT", "SYSTEM.SEQUENCE"); +SNAPSHOTS_TO_LOAD.put("SYSTEM.STATS_SNAPSHOT", "SYSTEM.STATS"); +} + +private static void decompress(String in, File out) throws IOException { +try (TarArchiveInputStream fin = new TarArchiveInputStream(new FileInputStream(in))){ +TarArchiveEntry entry; +while ((entry = fin.getNextTarEntry()) != null) { +if (entry.isDirectory()) { +continue; +} +File curfile = new File(out, entry.getName()); +File parent = curfile.getParentFile(); +if (!parent.exists())
[phoenix] branch master updated (c6c7a12426 -> fed272836f)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git from c6c7a12426 PHOENIX-6754 Upgrades from pre 4.10 versions are broken again add fed272836f PHOENIX-6653 Add upgrade tests based on HBase snapshots No new revisions were added by this update. Summary of changes: phoenix-core/pom.xml | 5 ++ ...plateIT.java => LoadSystemTableSnapshotIT.java} | 86 + .../it/resources/snapshots4_7/snapshots47.tar.gz | Bin 0 -> 76288 bytes .../phoenix/jdbc/PhoenixDatabaseMetaData.java | 1 + .../java/org/apache/phoenix/util/UpgradeUtil.java | 22 -- pom.xml| 6 ++ 6 files changed, 100 insertions(+), 20 deletions(-) rename phoenix-core/src/it/java/org/apache/phoenix/end2end/{SnapshotTestTemplateIT.java => LoadSystemTableSnapshotIT.java} (61%) create mode 100644 phoenix-core/src/it/resources/snapshots4_7/snapshots47.tar.gz
[phoenix] branch master updated (394f47222b -> c6c7a12426)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git from 394f47222b PHOENIX-6766 Fix failure of sqlline due to conflicting jline dependency pulled from Hadoop 3.3. add c6c7a12426 PHOENIX-6754 Upgrades from pre 4.10 versions are broken again No new revisions were added by this update. Summary of changes: .../apache/phoenix/schema/ColumnMetaDataOps.java| 21 +++-- .../org/apache/phoenix/schema/MetaDataClient.java | 4 ++-- 2 files changed, 17 insertions(+), 8 deletions(-)
[phoenix] branch 5.1 updated: PHOENIX-6753 Update default HBase 2.4 version to 2.4.13
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new a1a1c3758f PHOENIX-6753 Update default HBase 2.4 version to 2.4.13 a1a1c3758f is described below commit a1a1c3758f63f312219884cdc448932736c6e6f4 Author: Richard Antal AuthorDate: Tue Jul 26 14:06:11 2022 +0200 PHOENIX-6753 Update default HBase 2.4 version to 2.4.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9685467830..cbd8b2f240 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 2.2.7 2.3.7 2.4.0 -2.4.10 +2.4.13 src/main/antlr3
[phoenix] branch master updated (005986dee5 -> fdf2dc2ed1)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git from 005986dee5 PHOENIX-6681 addendum (#1471) add fdf2dc2ed1 PHOENIX-6753 Update default HBase 2.4 version to 2.4.13 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[phoenix-connectors] branch master updated: Revert "Bump protobuf-java from 2.5.0 to 3.16.1 in /phoenix5-spark3 (#81)"
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git The following commit(s) were added to refs/heads/master by this push: new 2c6912f Revert "Bump protobuf-java from 2.5.0 to 3.16.1 in /phoenix5-spark3 (#81)" 2c6912f is described below commit 2c6912fe7c5a41832dc739f5a8f88efb22d37cb6 Author: Istvan Toth AuthorDate: Wed Jun 15 16:24:15 2022 +0200 Revert "Bump protobuf-java from 2.5.0 to 3.16.1 in /phoenix5-spark3 (#81)" This reverts commit aa02b3463a07dea29c60d4f3be43f2fb2ce9a0e2. --- phoenix5-spark3/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix5-spark3/pom.xml b/phoenix5-spark3/pom.xml index 2221bea..13ff51a 100644 --- a/phoenix5-spark3/pom.xml +++ b/phoenix5-spark3/pom.xml @@ -122,7 +122,7 @@ com.google.protobuf protobuf-java - 3.16.1 + 2.5.0 provided
[phoenix-queryserver] branch master updated: PHOENIX-6727 get_view_names() returning empty list
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new aea5305 PHOENIX-6727 get_view_names() returning empty list aea5305 is described below commit aea5305c406fece97d5e69f3056bc9a0cfe99a31 Author: Richard Antal AuthorDate: Thu Jun 9 16:29:18 2022 +0200 PHOENIX-6727 get_view_names() returning empty list Change-Id: I674d7c6a92a418aae774075c480636fbab891b41 --- python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py| 4 ++-- python-phoenixdb/phoenixdb/tests/test_sqlalchemy.py | 4 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py b/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py index 8661417..15acdd1 100644 --- a/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py +++ b/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py @@ -153,8 +153,8 @@ class PhoenixDialect(DefaultDialect): def get_view_names(self, connection, schema=None, **kw): if schema is None: schema = '' -return connection.connect().connection.meta().get_tables(schemaPattern=schema, - typeList=('VIEW')) +views = connection.connect().connection.meta().get_tables(schemaPattern=schema, typeList=('VIEW',)) +return [view['TABLE_NAME'] for view in views] def get_columns(self, connection, table_name, schema=None, **kw): if schema is None: diff --git a/python-phoenixdb/phoenixdb/tests/test_sqlalchemy.py b/python-phoenixdb/phoenixdb/tests/test_sqlalchemy.py index c996262..82ebcc7 100644 --- a/python-phoenixdb/phoenixdb/tests/test_sqlalchemy.py +++ b/python-phoenixdb/phoenixdb/tests/test_sqlalchemy.py @@ -68,6 +68,7 @@ class SQLAlchemyTest(unittest.TestCase): connection.execute(text('create table ALCHEMY_TEST (ID integer primary key)')) connection.execute(text('create table A.ALCHEMY_TEST_A (ID_A integer primary key)')) connection.execute(text('create table B.ALCHEMY_TEST_B (ID_B integer primary key)')) +connection.execute(text('create view ALCHEMY_TEST_VIEW as select * from ALCHEMY_TEST')) self.assertEqual(inspector.get_schema_names(), ['', 'A', 'B', 'SYSTEM']) @@ -76,6 +77,8 @@ class SQLAlchemyTest(unittest.TestCase): self.assertEqual(inspector.get_table_names('A'), ['ALCHEMY_TEST_A']) self.assertEqual(inspector.get_table_names('B'), ['ALCHEMY_TEST_B']) +self.assertEqual(inspector.get_view_names(), ['ALCHEMY_TEST_VIEW']) + self.assertEqual(inspector.get_columns('ALCHEMY_TEST').pop()['name'], 'ID') self.assertEqual( inspector.get_columns('ALCHEMY_TEST', '').pop()['name'], 'ID') @@ -87,6 +90,7 @@ class SQLAlchemyTest(unittest.TestCase): self.assertTrue(engine.has_table('ALCHEMY_TEST_A', 'A')) self.assertFalse(engine.has_table('ALCHEMY_TEST', 'A')) finally: +connection.execute('drop view if exists ALCHEMY_TEST_VIEW') connection.execute('drop table if exists ALCHEMY_TEST') connection.execute('drop table if exists A.ALCHEMY_TEST_A') connection.execute('drop table if exists B.ALCHEMY_TEST_B')
svn commit: r1899733 [4/4] - in /phoenix/site/publish: ./ language/
Modified: phoenix/site/publish/metrics.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/metrics.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/metrics.html (original) +++ phoenix/site/publish/metrics.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/multi-tenancy.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/multi-tenancy.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/multi-tenancy.html (original) +++ phoenix/site/publish/multi-tenancy.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/namspace_mapping.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/namspace_mapping.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/namspace_mapping.html (original) +++ phoenix/site/publish/namspace_mapping.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/news.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/news.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/news.html (original) +++ phoenix/site/publish/news.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/omid.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/omid.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/omid.html (original) +++ phoenix/site/publish/omid.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/paged.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/paged.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/paged.html (original) +++ phoenix/site/publish/paged.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/performance.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/performance.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/performance.html (original) +++ phoenix/site/publish/performance.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/pherf.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/pherf.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/pherf.html (original) +++ phoenix/site/publish/pherf.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_mr.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_mr.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/phoenix_mr.html (original) +++ phoenix/site/publish/phoenix_mr.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_on_emr.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_on_emr.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/phoenix_on_emr.html (original) +++ phoenix/site/publish/phoenix_on_emr.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_orm.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_orm.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/phoenix_orm.html (original) +++ phoenix/site/publish/phoenix_orm.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_python.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_python.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/phoenix_python.html (original) +++ phoenix/site/publish/phoenix_python.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenix_spark.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_spark.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/phoenix_spark.html (original) +++ phoenix/site/publish/phoenix_spark.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/phoenixcon.html URL:
svn commit: r1899733 [3/4] - in /phoenix/site/publish: ./ language/
Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ @@ -168,7 +168,1678 @@ Grammar -update_here + + + +Commands + + + + + + +SELECT + +UPSERT VALUES + +UPSERT SELECT + +DELETE + +DECLARE CURSOR + +OPEN CURSOR + +FETCH NEXT + +CLOSE + +CREATE TABLE + + +DROP TABLE + +CREATE FUNCTION + +DROP FUNCTION + +CREATE VIEW + +DROP VIEW + +CREATE SEQUENCE + +DROP SEQUENCE + +ALTER + +CREATE INDEX + + +DROP INDEX + +ALTER INDEX + +EXPLAIN + +UPDATE STATISTICS + +CREATE SCHEMA + +USE + +DROP SCHEMA + +GRANT + +REVOKE + + + + + +Other Grammar + + + + + + +Constraint + +Options + +Hint + +Scan Hint + +Cache Hint + +Index Hint + +Small Hint + +Seek To Column Hint + +Join Hint + +Serial Hint + +Column Def + +Table Ref + +Sequence Ref + +Column Ref + +Select Expression + +Select Statement + +Split Point + +Table Spec + +Aliased Table Ref + + +Join Type + +Func Argument + +Class Name + +Jar Path + +Order + +Expression + +And Condition + +Boolean Condition + +Condition + +RHS Operand + +Operand + +Summand + +Factor + +Term + +Array Constructor + +Sequence + +Cast + +Row Value Constructor + +Bind Parameter + + +Value + +Case + +Case When + +Name + +Quoted Name + +Alias + +Null + +Data Type + +SQL Data Type + +HBase Data Type + +String + +Boolean + +Numeric + +Int + +Long + +Decimal + +Number + +Comments + + + + + + +SELECT + + +selectStatement [ { UNION ALL selectStatement [...] } ] +[ ORDER BY order [,...] ] [ LIMIT {bindParameter | number} ] +[ OFFSET {bindParameter | number} [ ROW | ROWS ] ] [ FETCH { FIRST | NEXT } {bindParameter | number} { ROW | ROWS } ONLY ] + + +selectStatementUNION ALL selectStatement...ORDER BY order, ...LIMITbindParameter< /td>numberOFFSETbindParameternumber< /td>ROWROWSFETCHFIRSTNEXTbindParameternumberROWROWSONLY + + + +Selects data from one or more tables. UNION ALL combines rows from multiple select statements. ORDER BY sorts the result based on the given expressions. LIMIT(or FETCH FIRST) limits the number of rows returned by the query with no limit applied if unspecified or specified as null or less than zero. The LIMIT(or FETCH FIRST) clause is executed after the ORDER BY clause to support top-N
svn commit: r1899733 [2/4] - in /phoenix/site/publish: ./ language/
Modified: phoenix/site/publish/language/functions.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/language/functions.html (original) +++ phoenix/site/publish/language/functions.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ @@ -168,7 +168,1886 @@ Functions -update_here + + + +Aggregate Functions + + + + + + +AVG + +COUNT + +APPROX_COUNT_DISTINCT + +MAX + +MIN + +SUM + + +PERCENTILE_CONT + +PERCENTILE_DISC + +PERCENT_RANK + +FIRST_VALUE + +LAST_VALUE + +FIRST_VALUES + + +LAST_VALUES + +NTH_VALUE + +STDDEV_POP + +STDDEV_SAMP + + + + + +String Functions + + + + + + +SUBSTR + +INSTR + +TRIM + +LTRIM + +RTRIM + + +LPAD + +LENGTH + +REGEXP_SUBSTR + +REGEXP_REPLACE + +REGEXP_SPLIT + + +UPPER + +LOWER + +REVERSE + +TO_CHAR + +COLLATION_KEY + + + + + +Time and Date Functions + + + + + + +TO_DATE + +TO_TIME + +TO_TIMESTAMP + +CURRENT_TIME + +CONVERT_TZ + +TIMEZONE_OFFSET + + +NOW + +YEAR + +MONTH + +WEEK + +DAYOFYEAR + +DAYOFMONTH + + +DAYOFWEEK + +HOUR + +MINUTE + +SECOND + + + + + +Numeric Functions + + + + + + +ROUND + +CEIL + + +FLOOR + +TRUNC + + +TO_NUMBER + +RAND + + + + + +Array Functions + + + + + + +ARRAY_ELEM + +ARRAY_LENGTH + +ARRAY_APPEND + + +ARRAY_PREPEND + +ARRAY_CAT + +ARRAY_FILL + + +ARRAY_TO_STRING + +ANY + +ALL + + + + + +Math Functions + + + + + + +SIGN + +ABS + +SQRT + + +CBRT + +EXP + +POWER + + +LN + +LOG + + + + + +Other Functions + + + + + + +MD5 + +INVERT + +ENCODE + +DECODE + + +COALESCE + +GET_BIT + +GET_BYTE + +OCTET_LENGTH + + +SET_BIT + +SET_BYTE + + + + + + + +AVG + + +AVG ( { numericTerm } ) + + +AVG ( numericTerm ) + + + +The average (mean) value. If no rows are selected, the result is NULL. Aggregates are only allowed in select statements. The returned value is of the same data type as the parameter. +Example: +AVG(X) + +COUNT + + +COUNT( [ DISTINCT ] { * | { term } } ) + + +COUNT (DISTINCT*term) + + + +The count of all row, or of the non-null values. This method returns a long. When DISTINCT is used, it counts only distinct values. If no rows are
svn commit: r1899733 [1/4] - in /phoenix/site/publish: ./ language/
Author: richardantal Date: Mon Apr 11 08:21:54 2022 New Revision: 1899733 URL: http://svn.apache.org/viewvc?rev=1899733=rev Log: Fix generated pages on the Website Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html phoenix/site/publish/array_type.html phoenix/site/publish/atomic_upsert.html phoenix/site/publish/building.html phoenix/site/publish/building_website.html phoenix/site/publish/bulk_dataload.html phoenix/site/publish/columnencoding.html phoenix/site/publish/contributing.html phoenix/site/publish/cursors.html phoenix/site/publish/develop.html phoenix/site/publish/download.html phoenix/site/publish/dynamic_columns.html phoenix/site/publish/explainplan.html phoenix/site/publish/faq.html phoenix/site/publish/flume.html phoenix/site/publish/hive_storage_handler.html phoenix/site/publish/index.html phoenix/site/publish/installation.html phoenix/site/publish/issues.html phoenix/site/publish/joins.html phoenix/site/publish/kafka.html phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/mailing_list.html phoenix/site/publish/metrics.html phoenix/site/publish/multi-tenancy.html phoenix/site/publish/namspace_mapping.html phoenix/site/publish/news.html phoenix/site/publish/omid.html phoenix/site/publish/paged.html phoenix/site/publish/performance.html phoenix/site/publish/pherf.html phoenix/site/publish/phoenix_mr.html phoenix/site/publish/phoenix_on_emr.html phoenix/site/publish/phoenix_orm.html phoenix/site/publish/phoenix_python.html phoenix/site/publish/phoenix_spark.html phoenix/site/publish/phoenixcon.html phoenix/site/publish/pig_integration.html phoenix/site/publish/python.html phoenix/site/publish/recent.html phoenix/site/publish/release.html phoenix/site/publish/release_notes.html phoenix/site/publish/resources.html phoenix/site/publish/roadmap.html phoenix/site/publish/rowtimestamp.html phoenix/site/publish/salted.html phoenix/site/publish/secondary_indexing.html phoenix/site/publish/sequences.html phoenix/site/publish/server.html phoenix/site/publish/skip_scan.html phoenix/site/publish/source.html phoenix/site/publish/subqueries.html phoenix/site/publish/tablesample.html phoenix/site/publish/team.html phoenix/site/publish/tech_talks.html phoenix/site/publish/tephra.html phoenix/site/publish/tracing.html phoenix/site/publish/transactions.html phoenix/site/publish/tuning.html phoenix/site/publish/tuning_guide.html phoenix/site/publish/udf.html phoenix/site/publish/update_statistics.html phoenix/site/publish/upgrading.html phoenix/site/publish/views.html phoenix/site/publish/who_is_using.html Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original) +++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/array_type.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/array_type.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/array_type.html (original) +++ phoenix/site/publish/array_type.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/atomic_upsert.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/atomic_upsert.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/atomic_upsert.html (original) +++ phoenix/site/publish/atomic_upsert.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/building.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/building.html (original) +++ phoenix/site/publish/building.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/building_website.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building_website.html?rev=1899733=1899732=1899733=diff == --- phoenix/site/publish/building_website.html (original) +++ phoenix/site/publish/building_website.html Mon Apr 11 08:21:54 2022 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/bulk_dataload.html URL: http://svn.apache.org/viewvc/phoenix
[phoenix-connectors] branch master updated: PHOENIX-6674 Update log4j2 test depenency version for phoenix-hive connector to the latest
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git The following commit(s) were added to refs/heads/master by this push: new 0d7b3c4 PHOENIX-6674 Update log4j2 test depenency version for phoenix-hive connector to the latest 0d7b3c4 is described below commit 0d7b3c488db6b9cfda38df6e63144b26381c4fe9 Author: Richard Antal AuthorDate: Thu Mar 24 10:43:24 2022 +0100 PHOENIX-6674 Update log4j2 test depenency version for phoenix-hive connector to the latest Change-Id: Ib790c8ae81f9d6046a861bcc431df15656cb7313 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c6506dd..28183b3 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 2.11 1.2.17 -2.16.0 +2.17.2 3.3.6 1.7.30 3.2.2
svn commit: r1899480 [3/3] - in /phoenix/site/publish/language: datatypes.html functions.html index.html
Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1899480=1899479=1899480=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Fri Apr 1 10:45:35 2022 @@ -168,7 +168,1678 @@ Grammar -update_here + + + +Commands + + + + + + +SELECT + +UPSERT VALUES + +UPSERT SELECT + +DELETE + +DECLARE CURSOR + +OPEN CURSOR + +FETCH NEXT + +CLOSE + +CREATE TABLE + + +DROP TABLE + +CREATE FUNCTION + +DROP FUNCTION + +CREATE VIEW + +DROP VIEW + +CREATE SEQUENCE + +DROP SEQUENCE + +ALTER + +CREATE INDEX + + +DROP INDEX + +ALTER INDEX + +EXPLAIN + +UPDATE STATISTICS + +CREATE SCHEMA + +USE + +DROP SCHEMA + +GRANT + +REVOKE + + + + + +Other Grammar + + + + + + +Constraint + +Options + +Hint + +Scan Hint + +Cache Hint + +Index Hint + +Small Hint + +Seek To Column Hint + +Join Hint + +Serial Hint + +Column Def + +Table Ref + +Sequence Ref + +Column Ref + +Select Expression + +Select Statement + +Split Point + +Table Spec + +Aliased Table Ref + + +Join Type + +Func Argument + +Class Name + +Jar Path + +Order + +Expression + +And Condition + +Boolean Condition + +Condition + +RHS Operand + +Operand + +Summand + +Factor + +Term + +Array Constructor + +Sequence + +Cast + +Row Value Constructor + +Bind Parameter + + +Value + +Case + +Case When + +Name + +Quoted Name + +Alias + +Null + +Data Type + +SQL Data Type + +HBase Data Type + +String + +Boolean + +Numeric + +Int + +Long + +Decimal + +Number + +Comments + + + + + + +SELECT + + +selectStatement [ { UNION ALL selectStatement [...] } ] +[ ORDER BY order [,...] ] [ LIMIT {bindParameter | number} ] +[ OFFSET {bindParameter | number} [ ROW | ROWS ] ] [ FETCH { FIRST | NEXT } {bindParameter | number} { ROW | ROWS } ONLY ] + + +selectStatementUNION ALL selectStatement...ORDER BY order, ...LIMITbindParameter< /td>numberOFFSETbindParameternumber< /td>ROWROWSFETCHFIRSTNEXTbindParameternumberROWROWSONLY + + + +Selects data from one or more tables. UNION ALL combines rows from multiple select statements. ORDER BY sorts the result based on the given expressions. LIMIT(or FETCH FIRST) limits the number of rows returned by the query with no limit applied if unspecified or specified as null or less than zero. The LIMIT(or FETCH FIRST) clause is executed after the ORDER BY clause to support top-N type queries. OFFSET clause skips that many rows before beginning to return rows. An optional hint may be used to override decisions made by the query optimizer. +Example: + +SELECT * FROM TEST LIMIT 1000;SELECT * FROM TEST LIMIT 1000 OFFSET 100;SELECT full_name FROM SALES_PERSON WHERE ranking = 5.0UNION ALL SELECT reviewer_name FROM CUSTOMER_REVIEW WHERE score = 8.0 + +UPSERT VALUES + + +UPSERT INTO tableName [( { columnRef | columnDef } [,...] )] VALUES ( constantTerm [,...] ) +[ON DUPLICATE KEY { IGNORE | UPDATE columnRef = operand } ] + + +UPSERT INTO tableName(columnRefcolumnDef, ...)VALUES ( constantTerm, ...)ON DUPLICATE KEYIGNOREUPDATE columnRef = operand + + + +Inserts if not present and updates otherwise the value in the table. The list of columns is optional and if not present, the values will map to the column in the order they are declared in the schema. The values must evaluate to constants.Use the ON DUPLICATE KEY clause (available in Phoenix 4.9) if you need the UPSERT to be
svn commit: r1899480 [2/3] - in /phoenix/site/publish/language: datatypes.html functions.html index.html
Modified: phoenix/site/publish/language/functions.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1899480=1899479=1899480=diff == --- phoenix/site/publish/language/functions.html (original) +++ phoenix/site/publish/language/functions.html Fri Apr 1 10:45:35 2022 @@ -168,7 +168,1886 @@ Functions -update_here + + + +Aggregate Functions + + + + + + +AVG + +COUNT + +APPROX_COUNT_DISTINCT + +MAX + +MIN + +SUM + + +PERCENTILE_CONT + +PERCENTILE_DISC + +PERCENT_RANK + +FIRST_VALUE + +LAST_VALUE + +FIRST_VALUES + + +LAST_VALUES + +NTH_VALUE + +STDDEV_POP + +STDDEV_SAMP + + + + + +String Functions + + + + + + +SUBSTR + +INSTR + +TRIM + +LTRIM + +RTRIM + + +LPAD + +LENGTH + +REGEXP_SUBSTR + +REGEXP_REPLACE + +REGEXP_SPLIT + + +UPPER + +LOWER + +REVERSE + +TO_CHAR + +COLLATION_KEY + + + + + +Time and Date Functions + + + + + + +TO_DATE + +TO_TIME + +TO_TIMESTAMP + +CURRENT_TIME + +CONVERT_TZ + +TIMEZONE_OFFSET + + +NOW + +YEAR + +MONTH + +WEEK + +DAYOFYEAR + +DAYOFMONTH + + +DAYOFWEEK + +HOUR + +MINUTE + +SECOND + + + + + +Numeric Functions + + + + + + +ROUND + +CEIL + + +FLOOR + +TRUNC + + +TO_NUMBER + +RAND + + + + + +Array Functions + + + + + + +ARRAY_ELEM + +ARRAY_LENGTH + +ARRAY_APPEND + + +ARRAY_PREPEND + +ARRAY_CAT + +ARRAY_FILL + + +ARRAY_TO_STRING + +ANY + +ALL + + + + + +Math Functions + + + + + + +SIGN + +ABS + +SQRT + + +CBRT + +EXP + +POWER + + +LN + +LOG + + + + + +Other Functions + + + + + + +MD5 + +INVERT + +ENCODE + +DECODE + + +COALESCE + +GET_BIT + +GET_BYTE + +OCTET_LENGTH + + +SET_BIT + +SET_BYTE + + + + + + + +AVG + + +AVG ( { numericTerm } ) + + +AVG ( numericTerm ) + + + +The average (mean) value. If no rows are selected, the result is NULL. Aggregates are only allowed in select statements. The returned value is of the same data type as the parameter. +Example: +AVG(X) + +COUNT + + +COUNT( [ DISTINCT ] { * | { term } } ) + + +COUNT (DISTINCT*term) + + + +The count of all row, or of the non-null values. This method returns a long. When DISTINCT is used, it counts only distinct values. If no rows are selected, the result is 0. Aggregates are only allowed in select statements. +Example: +COUNT(*) + +APPROX_COUNT_DISTINCT + + +APPROX_COUNT_DISTINCT( { * | { term } } ) + + +APPROX_COUNT_DISTINCT (*term) + + + +The approximate distinct count of all row, or of the non-null values. The relative error of approximation by default is less than 0.00405 This method returns a long. If no rows are selected, the result is 0. Aggregates are only allowed in select statements. +Example: +APPROX_COUNT_DISTINCT(*) + +MAX + + +MAX(term) + + +MAX ( term ) + + + +The highest value. If no rows are selected, the result is NULL. Aggregates are only allowed in select statements. The returned value is of the same data type as the parameter. +Example: +MAX(NAME) + +MIN + + +MIN(term) + + +MIN ( term ) + + + +The lowest value. If no rows are selected, the result is NULL. Aggregates are only allowed in select statements. The returned value is of the same data type as the parameter.
svn commit: r1899480 [1/3] - in /phoenix/site/publish/language: datatypes.html functions.html index.html
Author: richardantal Date: Fri Apr 1 10:45:35 2022 New Revision: 1899480 URL: http://svn.apache.org/viewvc?rev=1899480=rev Log: Fix generated pages on the Website Modified: phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html Modified: phoenix/site/publish/language/datatypes.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1899480=1899479=1899480=diff == --- phoenix/site/publish/language/datatypes.html (original) +++ phoenix/site/publish/language/datatypes.html Fri Apr 1 10:45:35 2022 @@ -168,7 +168,579 @@ Data Types -update_here + + + +Index + + + + + + +INTEGER Type + +UNSIGNED_INT Type + +BIGINT Type + +UNSIGNED_LONG Type + +TINYINT Type + +UNSIGNED_TINYINT Type + +SMALLINT Type + +UNSIGNED_SMALLINT Type + +FLOAT Type + + +UNSIGNED_FLOAT Type + +DOUBLE Type + +UNSIGNED_DOUBLE Type + +DECIMAL Type + +BOOLEAN Type + +TIME Type + +DATE Type + +TIMESTAMP Type + +UNSIGNED_TIME Type + + +UNSIGNED_DATE Type + +UNSIGNED_TIMESTAMP Type + +VARCHAR Type + +CHAR Type + +BINARY Type + +VARBINARY Type + +ARRAY + + + + + + +INTEGER Type + + +INTEGER + + +INTEGER + + + +Possible values: -2147483648 to 2147483647.Mapped to java.lang.Integer. The binary representation is a 4 byte integer with the sign bit flipped (so that negative values sorts before positive values). +Example: +INTEGER + +UNSIGNED_INT Type + + +UNSIGNED_INT + + +UNSIGNED_INT + + + +Possible values: 0 to 2147483647. Mapped to java.lang.Integer. The binary representation is a 4 byte integer, matching the HBase Bytes.toBytes(int) method. The purpose of this type is to map to existing HBase data that was serialized using this HBase utility method. If that is not the case, use the regular signed type instead. +Example: +UNSIGNED_INT + +BIGINT Type + + +BIGINT + + +BIGINT + + + +Possible values: -9223372036854775808 to 9223372036854775807. Mapped to java.lang.Long. The binary representation is an 8 byte long with the sign bit flipped (so that negative values sorts before positive values). +Example: +BIGINT + +UNSIGNED_LONG Type + + +UNSIGNED_LONG + + +UNSIGNED_LONG + + + +Possible values: 0 to 9223372036854775807. Mapped to java.lang.Long. The binary representation is an 8 byte integer, matching the HBase Bytes.toBytes(long) method. The purpose of this type is to map to existing HBase data that was serialized using this HBase utility method. If that is not the case, use the regular signed type instead. +Example: +UNSIGNED_LONG + +TINYINT Type + + +TINYINT + + +TINYINT + + + +Possible values: -128 to 127. Mapped to java.lang.Byte. The binary representation is a single byte, with the sign bit flipped (so that negative values sorts before positive values). +Example: +TINYINT + +UNSIGNED_TINYINT Type + + +UNSIGNED_TINYINT + + +UNSIGNED_TINYINT + + + +Possible values: 0 to 127. Mapped to java.lang.Byte. The binary representation is a single byte, matching the HBase Bytes.toBytes(byte) method. The purpose of this type is to map to existing HBase data that was serialized using this HBase utility method. If that is not the case, use the regular signed type instead. +Example: +UNSIGNED_TINYINT + +SMALLINT Type + + +SMALLINT + + +SMALLINT + + + +Possible values: -32768 to 32767. Mapped to java.lang.Short. The binary representation is a 2 byte short with the sign bit flipped (so that negative values sort before positive values). +Example: +SMALLINT + +UNSIGNED_SMALLINT Type + + +UNSIGNED_SMALLINT + + +UNSIGNED_SMALLINT + + + +Possible values: 0 to 32767. Mapped to java.lang.Short. The binary representation is an 2 byte integer, matching the HBase Bytes.toBytes(short) method. The purpose of this type is to map to existing HBase data that was serialized using this HBase utility method. If that is not the case, use the regular signed type instead. +Example: +UNSIGNED_SMALLINT + +FLOAT Type + + +FLOAT + + +FLOAT + + + +Possible values: -3.402823466 E + 38 to 3.402823466 E + 38. Mapped to java.lang.Float. The binary representation is an 4 byte float with the sign bit flipped (so that negative values sort before positive values). +Example: +FLOAT + +UNSIGNED_FLOAT Type + + +UNSIGNED_FLOAT + + +UNSIGNED_FLOAT + + + +Possible values: 0 to 3.402823466 E + 38. Mapped to java.lang.Float. The binary representation is an 4 byte float matching
[phoenix] branch 4.16 updated: PHOENIX-5865 Column that has default value can not be correctly indexed
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 4.16 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.16 by this push: new dc167be PHOENIX-5865 Column that has default value can not be correctly indexed dc167be is described below commit dc167be19355f305f5bf45c24652822ef665d297 Author: Richard Antal AuthorDate: Wed Dec 1 12:28:11 2021 +0100 PHOENIX-5865 Column that has default value can not be correctly indexed --- .../phoenix/end2end/IndexWithDefaultValueIT.java | 280 + .../expression/KeyValueColumnExpression.java | 9 + .../expression/SingleCellColumnExpression.java | 24 +- .../function/DefaultValueExpression.java | 12 +- .../phoenix/hbase/index/AbstractValueGetter.java | 4 +- .../org/apache/phoenix/schema/MetaDataClient.java | 7 +- .../phoenix/schema/tuple/ValueGetterTuple.java | 29 ++- 7 files changed, 348 insertions(+), 17 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java new file mode 100644 index 000..a93f4ab --- /dev/null +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java @@ -0,0 +1,280 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.phoenix.end2end; + + +import org.junit.Test; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.Properties; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; + + +public class IndexWithDefaultValueIT extends ParallelStatsDisabledIT { + +@Test +public void testQueryTableWithIndex() throws Exception { +String tableName = generateUniqueName(); +String indexName = generateUniqueName(); + +Properties props = new Properties(); +String schema = generateUniqueName(); +Connection conn = DriverManager.getConnection(getUrl(), props); + +conn.setSchema(schema); +conn.createStatement().execute("\n" + +"create table " + tableName + "(\n" + +"pk VARCHAR,\n" + +"b VARCHAR,\n" + +"c VARCHAR default '0',\n" + +"CONSTRAINT my_pk PRIMARY KEY (pk)\n" + +")"); + +conn.commit(); + +conn.createStatement().execute("upsert into " + tableName + " values('1','1','1')"); +conn.commit(); + +conn.createStatement().execute("CREATE INDEX " + indexName + " ON " + tableName + "(pk, b, c)"); +conn.commit(); + + +final PreparedStatement select = conn.prepareStatement( +"select * from " + tableName); + +ResultSet rs = select.executeQuery(); + +assertTrue(rs.next()); +assertEquals("1", rs.getString(3)); +assertFalse(rs.next()); +rs.close(); +conn.close(); +} + + + +@Test +public void testQueryTableWithIndexBigintDefault() throws Exception { +String tableName = generateUniqueName(); +String indexName = generateUniqueName(); + +Properties props = new Properties(); +String schema = generateUniqueName(); +Connection conn = DriverManager.getConnection(getUrl(), props); + + +conn.setSchema(schema); +conn.createStatement().execute("\n" + +"create table " + tableName + "(\n" + +"id CHAR(32) NOT NULL,\n" + +"no CHAR(32) default 'AB'," + +"total BIGINT default 0,\n" + +"score INTEGER default 0," + +"CONSTRAINT my_pk PRIMARY KEY (id)\n" + +")"); + +conn.commit(); +
[phoenix] branch 4.x updated: PHOENIX-5865 Column that has default value can not be correctly indexed
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 4.x in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x by this push: new 34f9938 PHOENIX-5865 Column that has default value can not be correctly indexed 34f9938 is described below commit 34f9938027b2f37370c87999a01f77ceda2eaf62 Author: Richard Antal AuthorDate: Wed Dec 1 12:28:11 2021 +0100 PHOENIX-5865 Column that has default value can not be correctly indexed --- .../phoenix/end2end/IndexWithDefaultValueIT.java | 280 + .../expression/KeyValueColumnExpression.java | 9 + .../expression/SingleCellColumnExpression.java | 24 +- .../function/DefaultValueExpression.java | 12 +- .../phoenix/hbase/index/AbstractValueGetter.java | 4 +- .../org/apache/phoenix/schema/MetaDataClient.java | 7 +- .../phoenix/schema/tuple/ValueGetterTuple.java | 29 ++- 7 files changed, 348 insertions(+), 17 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java new file mode 100644 index 000..a93f4ab --- /dev/null +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java @@ -0,0 +1,280 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.phoenix.end2end; + + +import org.junit.Test; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.Properties; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; + + +public class IndexWithDefaultValueIT extends ParallelStatsDisabledIT { + +@Test +public void testQueryTableWithIndex() throws Exception { +String tableName = generateUniqueName(); +String indexName = generateUniqueName(); + +Properties props = new Properties(); +String schema = generateUniqueName(); +Connection conn = DriverManager.getConnection(getUrl(), props); + +conn.setSchema(schema); +conn.createStatement().execute("\n" + +"create table " + tableName + "(\n" + +"pk VARCHAR,\n" + +"b VARCHAR,\n" + +"c VARCHAR default '0',\n" + +"CONSTRAINT my_pk PRIMARY KEY (pk)\n" + +")"); + +conn.commit(); + +conn.createStatement().execute("upsert into " + tableName + " values('1','1','1')"); +conn.commit(); + +conn.createStatement().execute("CREATE INDEX " + indexName + " ON " + tableName + "(pk, b, c)"); +conn.commit(); + + +final PreparedStatement select = conn.prepareStatement( +"select * from " + tableName); + +ResultSet rs = select.executeQuery(); + +assertTrue(rs.next()); +assertEquals("1", rs.getString(3)); +assertFalse(rs.next()); +rs.close(); +conn.close(); +} + + + +@Test +public void testQueryTableWithIndexBigintDefault() throws Exception { +String tableName = generateUniqueName(); +String indexName = generateUniqueName(); + +Properties props = new Properties(); +String schema = generateUniqueName(); +Connection conn = DriverManager.getConnection(getUrl(), props); + + +conn.setSchema(schema); +conn.createStatement().execute("\n" + +"create table " + tableName + "(\n" + +"id CHAR(32) NOT NULL,\n" + +"no CHAR(32) default 'AB'," + +"total BIGINT default 0,\n" + +"score INTEGER default 0," + +"CONSTRAINT my_pk PRIMARY KEY (id)\n" + +")"); + +conn.commit(); +
[phoenix] branch 4.16 updated: PHOENIX-6596 Schema extraction double quotes expressions, resulting in un-executabe create statements
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 4.16 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.16 by this push: new ecc8862 PHOENIX-6596 Schema extraction double quotes expressions, resulting in un-executabe create statements ecc8862 is described below commit ecc8862fb70ae7d1fc84b6aa51d2a2022a82a62f Author: Richard Antal AuthorDate: Thu Dec 9 14:00:08 2021 +0100 PHOENIX-6596 Schema extraction double quotes expressions, resulting in un-executabe create statements Co-authored-by: Istvan Toth --- .../schema/tool/SchemaToolExtractionIT.java| 63 -- .../schema/tool/SchemaExtractionProcessor.java | 28 -- .../org/apache/phoenix/schema/tool/SchemaTool.java | 1 - .../java/org/apache/phoenix/util/SchemaUtil.java | 23 4 files changed, 106 insertions(+), 9 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java index 6ba411c..0a733ae 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java @@ -93,13 +93,18 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT { String indexName = generateUniqueName(); String indexName1 = generateUniqueName(); String indexName2 = generateUniqueName(); +String indexName3 = generateUniqueName(); String properties = "TTL=2592000,IMMUTABLE_ROWS=true,DISABLE_WAL=true"; String pTableFullName = SchemaUtil.getQualifiedTableName(schemaName, tableName); -String createTableStatement = "CREATE TABLE "+pTableFullName + "(k VARCHAR NOT NULL PRIMARY KEY, v1 VARCHAR, v2 VARCHAR)" +String createTableStatement = "CREATE TABLE "+pTableFullName + "(k VARCHAR NOT NULL PRIMARY KEY, \"v1\" VARCHAR, v2 VARCHAR)" + properties; -String createIndexStatement = "CREATE INDEX "+indexName + " ON "+pTableFullName+"(v1 DESC) INCLUDE (v2)"; -String createIndexStatement1 = "CREATE INDEX "+indexName1 + " ON "+pTableFullName+"(v2 DESC) INCLUDE (v1)"; +//FIXME never verified +String createIndexStatement = "CREATE INDEX "+indexName + " ON "+pTableFullName+"(\"v1\" DESC) INCLUDE (v2)"; +//FIXME never verified +String createIndexStatement1 = "CREATE INDEX "+indexName1 + " ON "+pTableFullName+"(v2 DESC) INCLUDE (\"v1\")"; String createIndexStatement2 = "CREATE INDEX "+indexName2 + " ON "+pTableFullName+"(k)"; +String createIndexStatement3 ="CREATE INDEX " + indexName3 + " ON " + pTableFullName + +"('QUOTED' || \"v1\" || V2 DESC, \"v1\" DESC, K) INCLUDE (V2)"; List queries = new ArrayList(){}; queries.add(createTableStatement); queries.add(createIndexStatement); @@ -108,6 +113,12 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT { String result = runSchemaExtractionTool(schemaName, indexName2, null, queries); Assert.assertEquals(createIndexStatement2.toUpperCase(), result.toUpperCase()); + +List queries3 = new ArrayList(){}; +queries3.add(createIndexStatement3); + +String result3 = runSchemaExtractionTool(schemaName, indexName3, null, queries3); +Assert.assertEquals(createIndexStatement3, result3); } @Test @@ -144,17 +155,45 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT { String tableName = generateUniqueName(); String schemaName = generateUniqueName(); String indexName = generateUniqueName(); +String indexName2 = generateUniqueName(); String properties = "TTL=2592000,IMMUTABLE_ROWS=true,DISABLE_WAL=true"; String pTableFullName = SchemaUtil.getQualifiedTableName(schemaName, tableName); String createTableStatement = "CREATE TABLE "+pTableFullName + "(k VARCHAR NOT NULL PRIMARY KEY, v1 VARCHAR, v2 VARCHAR)" + properties; String createIndexStatement = "CREATE LOCAL INDEX "+indexName + " ON "+pTableFullName+"(v1 DESC, k) INCLUDE (v2)"; +String createIndexStatement2 = "CREATE LOCAL INDEX "+indexName2 + " ON "+pTableFullName+"( LPAD(v1,10) DESC, k) INCLUDE (v2)"; + List queries = new ArrayList(){}; queries.add(createTableStatement);
[phoenix] branch 4.x updated: PHOENIX-6596 Schema extraction double quotes expressions, resulting in un-executabe create statements
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 4.x in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x by this push: new 0f5fac9 PHOENIX-6596 Schema extraction double quotes expressions, resulting in un-executabe create statements 0f5fac9 is described below commit 0f5fac99a981a781e0dd517e7aaeb15abaaa9012 Author: Richard Antal AuthorDate: Thu Dec 9 14:00:08 2021 +0100 PHOENIX-6596 Schema extraction double quotes expressions, resulting in un-executabe create statements Co-authored-by: Istvan Toth --- .../schema/tool/SchemaToolExtractionIT.java| 63 -- .../schema/tool/SchemaExtractionProcessor.java | 28 -- .../org/apache/phoenix/schema/tool/SchemaTool.java | 1 - .../java/org/apache/phoenix/util/SchemaUtil.java | 23 4 files changed, 106 insertions(+), 9 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java index 6ba411c..0a733ae 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java @@ -93,13 +93,18 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT { String indexName = generateUniqueName(); String indexName1 = generateUniqueName(); String indexName2 = generateUniqueName(); +String indexName3 = generateUniqueName(); String properties = "TTL=2592000,IMMUTABLE_ROWS=true,DISABLE_WAL=true"; String pTableFullName = SchemaUtil.getQualifiedTableName(schemaName, tableName); -String createTableStatement = "CREATE TABLE "+pTableFullName + "(k VARCHAR NOT NULL PRIMARY KEY, v1 VARCHAR, v2 VARCHAR)" +String createTableStatement = "CREATE TABLE "+pTableFullName + "(k VARCHAR NOT NULL PRIMARY KEY, \"v1\" VARCHAR, v2 VARCHAR)" + properties; -String createIndexStatement = "CREATE INDEX "+indexName + " ON "+pTableFullName+"(v1 DESC) INCLUDE (v2)"; -String createIndexStatement1 = "CREATE INDEX "+indexName1 + " ON "+pTableFullName+"(v2 DESC) INCLUDE (v1)"; +//FIXME never verified +String createIndexStatement = "CREATE INDEX "+indexName + " ON "+pTableFullName+"(\"v1\" DESC) INCLUDE (v2)"; +//FIXME never verified +String createIndexStatement1 = "CREATE INDEX "+indexName1 + " ON "+pTableFullName+"(v2 DESC) INCLUDE (\"v1\")"; String createIndexStatement2 = "CREATE INDEX "+indexName2 + " ON "+pTableFullName+"(k)"; +String createIndexStatement3 ="CREATE INDEX " + indexName3 + " ON " + pTableFullName + +"('QUOTED' || \"v1\" || V2 DESC, \"v1\" DESC, K) INCLUDE (V2)"; List queries = new ArrayList(){}; queries.add(createTableStatement); queries.add(createIndexStatement); @@ -108,6 +113,12 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT { String result = runSchemaExtractionTool(schemaName, indexName2, null, queries); Assert.assertEquals(createIndexStatement2.toUpperCase(), result.toUpperCase()); + +List queries3 = new ArrayList(){}; +queries3.add(createIndexStatement3); + +String result3 = runSchemaExtractionTool(schemaName, indexName3, null, queries3); +Assert.assertEquals(createIndexStatement3, result3); } @Test @@ -144,17 +155,45 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT { String tableName = generateUniqueName(); String schemaName = generateUniqueName(); String indexName = generateUniqueName(); +String indexName2 = generateUniqueName(); String properties = "TTL=2592000,IMMUTABLE_ROWS=true,DISABLE_WAL=true"; String pTableFullName = SchemaUtil.getQualifiedTableName(schemaName, tableName); String createTableStatement = "CREATE TABLE "+pTableFullName + "(k VARCHAR NOT NULL PRIMARY KEY, v1 VARCHAR, v2 VARCHAR)" + properties; String createIndexStatement = "CREATE LOCAL INDEX "+indexName + " ON "+pTableFullName+"(v1 DESC, k) INCLUDE (v2)"; +String createIndexStatement2 = "CREATE LOCAL INDEX "+indexName2 + " ON "+pTableFullName+"( LPAD(v1,10) DESC, k) INCLUDE (v2)"; + List queries = new ArrayList(){}; queries.add(createTableStatement);
[phoenix] branch 5.1 updated: PHOENIX-6596 Schema extraction double quotes expressions, resulting in un-executabe create statements
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new 811b70d PHOENIX-6596 Schema extraction double quotes expressions, resulting in un-executabe create statements 811b70d is described below commit 811b70d9655ec458fa39a5309b69a827d001c665 Author: Richard Antal AuthorDate: Thu Dec 9 14:00:08 2021 +0100 PHOENIX-6596 Schema extraction double quotes expressions, resulting in un-executabe create statements Co-authored-by: Istvan Toth --- .../schema/tool/SchemaToolExtractionIT.java| 63 -- .../schema/tool/SchemaExtractionProcessor.java | 28 -- .../org/apache/phoenix/schema/tool/SchemaTool.java | 1 - .../java/org/apache/phoenix/util/SchemaUtil.java | 23 4 files changed, 106 insertions(+), 9 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java index 6ba411c..0a733ae 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java @@ -93,13 +93,18 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT { String indexName = generateUniqueName(); String indexName1 = generateUniqueName(); String indexName2 = generateUniqueName(); +String indexName3 = generateUniqueName(); String properties = "TTL=2592000,IMMUTABLE_ROWS=true,DISABLE_WAL=true"; String pTableFullName = SchemaUtil.getQualifiedTableName(schemaName, tableName); -String createTableStatement = "CREATE TABLE "+pTableFullName + "(k VARCHAR NOT NULL PRIMARY KEY, v1 VARCHAR, v2 VARCHAR)" +String createTableStatement = "CREATE TABLE "+pTableFullName + "(k VARCHAR NOT NULL PRIMARY KEY, \"v1\" VARCHAR, v2 VARCHAR)" + properties; -String createIndexStatement = "CREATE INDEX "+indexName + " ON "+pTableFullName+"(v1 DESC) INCLUDE (v2)"; -String createIndexStatement1 = "CREATE INDEX "+indexName1 + " ON "+pTableFullName+"(v2 DESC) INCLUDE (v1)"; +//FIXME never verified +String createIndexStatement = "CREATE INDEX "+indexName + " ON "+pTableFullName+"(\"v1\" DESC) INCLUDE (v2)"; +//FIXME never verified +String createIndexStatement1 = "CREATE INDEX "+indexName1 + " ON "+pTableFullName+"(v2 DESC) INCLUDE (\"v1\")"; String createIndexStatement2 = "CREATE INDEX "+indexName2 + " ON "+pTableFullName+"(k)"; +String createIndexStatement3 ="CREATE INDEX " + indexName3 + " ON " + pTableFullName + +"('QUOTED' || \"v1\" || V2 DESC, \"v1\" DESC, K) INCLUDE (V2)"; List queries = new ArrayList(){}; queries.add(createTableStatement); queries.add(createIndexStatement); @@ -108,6 +113,12 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT { String result = runSchemaExtractionTool(schemaName, indexName2, null, queries); Assert.assertEquals(createIndexStatement2.toUpperCase(), result.toUpperCase()); + +List queries3 = new ArrayList(){}; +queries3.add(createIndexStatement3); + +String result3 = runSchemaExtractionTool(schemaName, indexName3, null, queries3); +Assert.assertEquals(createIndexStatement3, result3); } @Test @@ -144,17 +155,45 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT { String tableName = generateUniqueName(); String schemaName = generateUniqueName(); String indexName = generateUniqueName(); +String indexName2 = generateUniqueName(); String properties = "TTL=2592000,IMMUTABLE_ROWS=true,DISABLE_WAL=true"; String pTableFullName = SchemaUtil.getQualifiedTableName(schemaName, tableName); String createTableStatement = "CREATE TABLE "+pTableFullName + "(k VARCHAR NOT NULL PRIMARY KEY, v1 VARCHAR, v2 VARCHAR)" + properties; String createIndexStatement = "CREATE LOCAL INDEX "+indexName + " ON "+pTableFullName+"(v1 DESC, k) INCLUDE (v2)"; +String createIndexStatement2 = "CREATE LOCAL INDEX "+indexName2 + " ON "+pTableFullName+"( LPAD(v1,10) DESC, k) INCLUDE (v2)"; + List queries = new ArrayList(){}; queries.add(createTableStatement);
[phoenix] branch master updated: PHOENIX-6596 Schema extraction double quotes expressions, resulting in un-executabe create statements
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new faa5da8 PHOENIX-6596 Schema extraction double quotes expressions, resulting in un-executabe create statements faa5da8 is described below commit faa5da80a663fa916a4906142eb0eaf68da0cc53 Author: Richard Antal AuthorDate: Thu Dec 9 14:00:08 2021 +0100 PHOENIX-6596 Schema extraction double quotes expressions, resulting in un-executabe create statements Co-authored-by: Istvan Toth --- .../schema/tool/SchemaToolExtractionIT.java| 63 -- .../schema/tool/SchemaExtractionProcessor.java | 28 -- .../org/apache/phoenix/schema/tool/SchemaTool.java | 1 - .../java/org/apache/phoenix/util/SchemaUtil.java | 23 4 files changed, 106 insertions(+), 9 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java index 6ba411c..0a733ae 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java @@ -93,13 +93,18 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT { String indexName = generateUniqueName(); String indexName1 = generateUniqueName(); String indexName2 = generateUniqueName(); +String indexName3 = generateUniqueName(); String properties = "TTL=2592000,IMMUTABLE_ROWS=true,DISABLE_WAL=true"; String pTableFullName = SchemaUtil.getQualifiedTableName(schemaName, tableName); -String createTableStatement = "CREATE TABLE "+pTableFullName + "(k VARCHAR NOT NULL PRIMARY KEY, v1 VARCHAR, v2 VARCHAR)" +String createTableStatement = "CREATE TABLE "+pTableFullName + "(k VARCHAR NOT NULL PRIMARY KEY, \"v1\" VARCHAR, v2 VARCHAR)" + properties; -String createIndexStatement = "CREATE INDEX "+indexName + " ON "+pTableFullName+"(v1 DESC) INCLUDE (v2)"; -String createIndexStatement1 = "CREATE INDEX "+indexName1 + " ON "+pTableFullName+"(v2 DESC) INCLUDE (v1)"; +//FIXME never verified +String createIndexStatement = "CREATE INDEX "+indexName + " ON "+pTableFullName+"(\"v1\" DESC) INCLUDE (v2)"; +//FIXME never verified +String createIndexStatement1 = "CREATE INDEX "+indexName1 + " ON "+pTableFullName+"(v2 DESC) INCLUDE (\"v1\")"; String createIndexStatement2 = "CREATE INDEX "+indexName2 + " ON "+pTableFullName+"(k)"; +String createIndexStatement3 ="CREATE INDEX " + indexName3 + " ON " + pTableFullName + +"('QUOTED' || \"v1\" || V2 DESC, \"v1\" DESC, K) INCLUDE (V2)"; List queries = new ArrayList(){}; queries.add(createTableStatement); queries.add(createIndexStatement); @@ -108,6 +113,12 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT { String result = runSchemaExtractionTool(schemaName, indexName2, null, queries); Assert.assertEquals(createIndexStatement2.toUpperCase(), result.toUpperCase()); + +List queries3 = new ArrayList(){}; +queries3.add(createIndexStatement3); + +String result3 = runSchemaExtractionTool(schemaName, indexName3, null, queries3); +Assert.assertEquals(createIndexStatement3, result3); } @Test @@ -144,17 +155,45 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT { String tableName = generateUniqueName(); String schemaName = generateUniqueName(); String indexName = generateUniqueName(); +String indexName2 = generateUniqueName(); String properties = "TTL=2592000,IMMUTABLE_ROWS=true,DISABLE_WAL=true"; String pTableFullName = SchemaUtil.getQualifiedTableName(schemaName, tableName); String createTableStatement = "CREATE TABLE "+pTableFullName + "(k VARCHAR NOT NULL PRIMARY KEY, v1 VARCHAR, v2 VARCHAR)" + properties; String createIndexStatement = "CREATE LOCAL INDEX "+indexName + " ON "+pTableFullName+"(v1 DESC, k) INCLUDE (v2)"; +String createIndexStatement2 = "CREATE LOCAL INDEX "+indexName2 + " ON "+pTableFullName+"( LPAD(v1,10) DESC, k) INCLUDE (v2)"; + List queries = new ArrayList(){}; queries.add(createTableStatement);
[phoenix] branch 5.1 updated: PHOENIX-5865 Column that has default value can not be correctly indexed
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new c9d663c PHOENIX-5865 Column that has default value can not be correctly indexed c9d663c is described below commit c9d663ccf155a9add374b6a4f16cf1685c0fb9a9 Author: Richard Antal AuthorDate: Wed Dec 1 12:28:11 2021 +0100 PHOENIX-5865 Column that has default value can not be correctly indexed --- .../phoenix/end2end/IndexWithDefaultValueIT.java | 280 + .../expression/KeyValueColumnExpression.java | 9 + .../expression/SingleCellColumnExpression.java | 24 +- .../function/DefaultValueExpression.java | 12 +- .../phoenix/hbase/index/AbstractValueGetter.java | 4 +- .../org/apache/phoenix/schema/MetaDataClient.java | 33 ++- .../phoenix/schema/tuple/ValueGetterTuple.java | 29 ++- 7 files changed, 362 insertions(+), 29 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java new file mode 100644 index 000..a93f4ab --- /dev/null +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java @@ -0,0 +1,280 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.phoenix.end2end; + + +import org.junit.Test; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.Properties; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; + + +public class IndexWithDefaultValueIT extends ParallelStatsDisabledIT { + +@Test +public void testQueryTableWithIndex() throws Exception { +String tableName = generateUniqueName(); +String indexName = generateUniqueName(); + +Properties props = new Properties(); +String schema = generateUniqueName(); +Connection conn = DriverManager.getConnection(getUrl(), props); + +conn.setSchema(schema); +conn.createStatement().execute("\n" + +"create table " + tableName + "(\n" + +"pk VARCHAR,\n" + +"b VARCHAR,\n" + +"c VARCHAR default '0',\n" + +"CONSTRAINT my_pk PRIMARY KEY (pk)\n" + +")"); + +conn.commit(); + +conn.createStatement().execute("upsert into " + tableName + " values('1','1','1')"); +conn.commit(); + +conn.createStatement().execute("CREATE INDEX " + indexName + " ON " + tableName + "(pk, b, c)"); +conn.commit(); + + +final PreparedStatement select = conn.prepareStatement( +"select * from " + tableName); + +ResultSet rs = select.executeQuery(); + +assertTrue(rs.next()); +assertEquals("1", rs.getString(3)); +assertFalse(rs.next()); +rs.close(); +conn.close(); +} + + + +@Test +public void testQueryTableWithIndexBigintDefault() throws Exception { +String tableName = generateUniqueName(); +String indexName = generateUniqueName(); + +Properties props = new Properties(); +String schema = generateUniqueName(); +Connection conn = DriverManager.getConnection(getUrl(), props); + + +conn.setSchema(schema); +conn.createStatement().execute("\n" + +"create table " + tableName + "(\n" + +"id CHAR(32) NOT NULL,\n" + +"no CHAR(32) default 'AB'," + +"total BIGINT default 0,\n" + +"score INTEGER default 0," + +"CONSTRAINT my_pk PRIMARY KEY (id)\n" + +")"); + +conn.commit(); +
[phoenix] branch master updated (7997503 -> 3749cfc)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git. from 7997503 PHOENIX-6620 TransformTool to fix unverified rows and do validation add 3749cfc PHOENIX-5865 Column that has default value can not be correctly indexed No new revisions were added by this update. Summary of changes: .../phoenix/end2end/IndexWithDefaultValueIT.java | 280 + .../expression/KeyValueColumnExpression.java | 9 + .../expression/SingleCellColumnExpression.java | 24 +- .../function/DefaultValueExpression.java | 12 +- .../phoenix/hbase/index/AbstractValueGetter.java | 4 +- .../org/apache/phoenix/schema/MetaDataClient.java | 33 ++- .../phoenix/schema/tuple/ValueGetterTuple.java | 29 ++- 7 files changed, 362 insertions(+), 29 deletions(-) create mode 100644 phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexWithDefaultValueIT.java
[phoenix] branch 4.16 updated: PHOENIX-6563 Unable to use 'UPPER'/'LOWER' together with 'IN'
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 4.16 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.16 by this push: new e902881 PHOENIX-6563 Unable to use 'UPPER'/'LOWER' together with 'IN' e902881 is described below commit e902881d645ab0dcdc6e6213f11f42c59bad102c Author: Richard Antal AuthorDate: Tue Sep 28 13:49:44 2021 +0200 PHOENIX-6563 Unable to use 'UPPER'/'LOWER' together with 'IN' --- .../java/org/apache/phoenix/end2end/InListIT.java | 52 ++ .../phoenix/expression/function/LowerFunction.java | 7 ++- .../phoenix/expression/function/UpperFunction.java | 7 ++- 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java index d1ebdd2..b16f704 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java @@ -593,6 +593,58 @@ public class InListIT extends ParallelStatsDisabledIT { } } +@Test +public void testUpperWithInChar() throws Exception { +String baseTable = generateUniqueName(); +try (Connection conn = DriverManager.getConnection(getUrl()); + Statement stmt = conn.createStatement()) { +stmt.execute("CREATE TABLE " + baseTable + +" (ID BIGINT NOT NULL primary key, A CHAR(2))"); +PreparedStatement pstmt = conn.prepareStatement("UPSERT INTO " + baseTable + +" VALUES (?, ?)"); +pstmt.setInt(1, 1); +pstmt.setString(2, "a"); +pstmt.executeUpdate(); +conn.commit(); +pstmt.setInt(1, 2); +pstmt.setString(2, "b"); +pstmt.executeUpdate(); +conn.commit(); + +ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM " + baseTable + +" WHERE UPPER(A) IN ('A', 'C')"); +assertTrue(rs.next()); +assertEquals(rs.getString(2), "a"); +assertFalse(rs.next()); +} +} + +@Test +public void testLowerWithInChar() throws Exception { +String baseTable = generateUniqueName(); +try (Connection conn = DriverManager.getConnection(getUrl()); + Statement stmt = conn.createStatement()) { +stmt.execute("CREATE TABLE " + baseTable + +" (ID BIGINT NOT NULL primary key, A CHAR(2))"); +PreparedStatement pstmt = conn.prepareStatement("UPSERT INTO " + baseTable + +" VALUES (?, ?)"); +pstmt.setInt(1, 1); +pstmt.setString(2, "A"); +pstmt.executeUpdate(); +conn.commit(); +pstmt.setInt(1, 2); +pstmt.setString(2, "B"); +pstmt.executeUpdate(); +conn.commit(); + +ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM " + baseTable + +" WHERE LOWER(A) IN ('a', 'c')"); +assertTrue(rs.next()); +assertEquals(rs.getString(2), "A"); +assertFalse(rs.next()); +} +} + @Test(expected = TypeMismatchException.class) public void testInListExpressionWithNotValidElements() throws Exception { try (Connection conn = DriverManager.getConnection(getUrl())) { diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java index 8d468b3..f444d36 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java @@ -50,7 +50,7 @@ public class LowerFunction extends ScalarFunction { } private void initialize() { -if(children.size() > 1) { +if (children.size() > 1) { String localeISOCode = getLiteralValue(1, String.class); locale = LocaleUtils.get().getLocaleByIsoCode(localeISOCode); } @@ -89,6 +89,11 @@ public class LowerFunction extends ScalarFunction { } @Override +public Integer getMaxLength() { +return getStrExpression().getMaxLength(); +} + +@Override public boolean isNullable() { return getStrExpression().isNullable(); } diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/UpperFunction.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/UpperFunction.java index c8e7096..0969269 1006
[phoenix] branch 4.x updated: PHOENIX-6563 Unable to use 'UPPER'/'LOWER' together with 'IN'
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 4.x in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x by this push: new 4df9540 PHOENIX-6563 Unable to use 'UPPER'/'LOWER' together with 'IN' 4df9540 is described below commit 4df9540362809b84a627ef1ac7540d697e7cdd22 Author: Richard Antal AuthorDate: Tue Sep 28 13:49:44 2021 +0200 PHOENIX-6563 Unable to use 'UPPER'/'LOWER' together with 'IN' --- .../java/org/apache/phoenix/end2end/InListIT.java | 52 ++ .../phoenix/expression/function/LowerFunction.java | 7 ++- .../phoenix/expression/function/UpperFunction.java | 7 ++- 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java index d1ebdd2..b16f704 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java @@ -593,6 +593,58 @@ public class InListIT extends ParallelStatsDisabledIT { } } +@Test +public void testUpperWithInChar() throws Exception { +String baseTable = generateUniqueName(); +try (Connection conn = DriverManager.getConnection(getUrl()); + Statement stmt = conn.createStatement()) { +stmt.execute("CREATE TABLE " + baseTable + +" (ID BIGINT NOT NULL primary key, A CHAR(2))"); +PreparedStatement pstmt = conn.prepareStatement("UPSERT INTO " + baseTable + +" VALUES (?, ?)"); +pstmt.setInt(1, 1); +pstmt.setString(2, "a"); +pstmt.executeUpdate(); +conn.commit(); +pstmt.setInt(1, 2); +pstmt.setString(2, "b"); +pstmt.executeUpdate(); +conn.commit(); + +ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM " + baseTable + +" WHERE UPPER(A) IN ('A', 'C')"); +assertTrue(rs.next()); +assertEquals(rs.getString(2), "a"); +assertFalse(rs.next()); +} +} + +@Test +public void testLowerWithInChar() throws Exception { +String baseTable = generateUniqueName(); +try (Connection conn = DriverManager.getConnection(getUrl()); + Statement stmt = conn.createStatement()) { +stmt.execute("CREATE TABLE " + baseTable + +" (ID BIGINT NOT NULL primary key, A CHAR(2))"); +PreparedStatement pstmt = conn.prepareStatement("UPSERT INTO " + baseTable + +" VALUES (?, ?)"); +pstmt.setInt(1, 1); +pstmt.setString(2, "A"); +pstmt.executeUpdate(); +conn.commit(); +pstmt.setInt(1, 2); +pstmt.setString(2, "B"); +pstmt.executeUpdate(); +conn.commit(); + +ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM " + baseTable + +" WHERE LOWER(A) IN ('a', 'c')"); +assertTrue(rs.next()); +assertEquals(rs.getString(2), "A"); +assertFalse(rs.next()); +} +} + @Test(expected = TypeMismatchException.class) public void testInListExpressionWithNotValidElements() throws Exception { try (Connection conn = DriverManager.getConnection(getUrl())) { diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java index 8d468b3..f444d36 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java @@ -50,7 +50,7 @@ public class LowerFunction extends ScalarFunction { } private void initialize() { -if(children.size() > 1) { +if (children.size() > 1) { String localeISOCode = getLiteralValue(1, String.class); locale = LocaleUtils.get().getLocaleByIsoCode(localeISOCode); } @@ -89,6 +89,11 @@ public class LowerFunction extends ScalarFunction { } @Override +public Integer getMaxLength() { +return getStrExpression().getMaxLength(); +} + +@Override public boolean isNullable() { return getStrExpression().isNullable(); } diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/UpperFunction.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/UpperFunction.java index c8e7096..0969269 1006
[phoenix] branch 5.1 updated: PHOENIX-6563 Unable to use 'UPPER'/'LOWER' together with 'IN'
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new 5e92f26 PHOENIX-6563 Unable to use 'UPPER'/'LOWER' together with 'IN' 5e92f26 is described below commit 5e92f26145eb69e8435556b9e8a119b86333128a Author: Richard Antal AuthorDate: Tue Sep 28 13:49:44 2021 +0200 PHOENIX-6563 Unable to use 'UPPER'/'LOWER' together with 'IN' --- .../java/org/apache/phoenix/end2end/InListIT.java | 52 ++ .../phoenix/expression/function/LowerFunction.java | 7 ++- .../phoenix/expression/function/UpperFunction.java | 7 ++- 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java index d71400c..c64426c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java @@ -592,6 +592,58 @@ public class InListIT extends ParallelStatsDisabledIT { } } +@Test +public void testUpperWithInChar() throws Exception { +String baseTable = generateUniqueName(); +try (Connection conn = DriverManager.getConnection(getUrl()); + Statement stmt = conn.createStatement()) { +stmt.execute("CREATE TABLE " + baseTable + +" (ID BIGINT NOT NULL primary key, A CHAR(2))"); +PreparedStatement pstmt = conn.prepareStatement("UPSERT INTO " + baseTable + +" VALUES (?, ?)"); +pstmt.setInt(1, 1); +pstmt.setString(2, "a"); +pstmt.executeUpdate(); +conn.commit(); +pstmt.setInt(1, 2); +pstmt.setString(2, "b"); +pstmt.executeUpdate(); +conn.commit(); + +ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM " + baseTable + +" WHERE UPPER(A) IN ('A', 'C')"); +assertTrue(rs.next()); +assertEquals(rs.getString(2), "a"); +assertFalse(rs.next()); +} +} + +@Test +public void testLowerWithInChar() throws Exception { +String baseTable = generateUniqueName(); +try (Connection conn = DriverManager.getConnection(getUrl()); + Statement stmt = conn.createStatement()) { +stmt.execute("CREATE TABLE " + baseTable + +" (ID BIGINT NOT NULL primary key, A CHAR(2))"); +PreparedStatement pstmt = conn.prepareStatement("UPSERT INTO " + baseTable + +" VALUES (?, ?)"); +pstmt.setInt(1, 1); +pstmt.setString(2, "A"); +pstmt.executeUpdate(); +conn.commit(); +pstmt.setInt(1, 2); +pstmt.setString(2, "B"); +pstmt.executeUpdate(); +conn.commit(); + +ResultSet rs = conn.createStatement().executeQuery("SELECT * FROM " + baseTable + +" WHERE LOWER(A) IN ('a', 'c')"); +assertTrue(rs.next()); +assertEquals(rs.getString(2), "A"); +assertFalse(rs.next()); +} +} + @Test(expected = TypeMismatchException.class) public void testInListExpressionWithNotValidElements() throws Exception { try (Connection conn = DriverManager.getConnection(getUrl())) { diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java index 8d468b3..f444d36 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java @@ -50,7 +50,7 @@ public class LowerFunction extends ScalarFunction { } private void initialize() { -if(children.size() > 1) { +if (children.size() > 1) { String localeISOCode = getLiteralValue(1, String.class); locale = LocaleUtils.get().getLocaleByIsoCode(localeISOCode); } @@ -89,6 +89,11 @@ public class LowerFunction extends ScalarFunction { } @Override +public Integer getMaxLength() { +return getStrExpression().getMaxLength(); +} + +@Override public boolean isNullable() { return getStrExpression().isNullable(); } diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/UpperFunction.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/UpperFunction.java index c8e7096..0969269 1006
[phoenix] branch master updated (dd3d853 -> 4e5ac4d)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git. from dd3d853 PHOENIX-6557 Fix code problems flagged by SpotBugs as High priority add 4e5ac4d PHOENIX-6563 Unable to use 'UPPER'/'LOWER' together with 'IN' No new revisions were added by this update. Summary of changes: .../java/org/apache/phoenix/end2end/InListIT.java | 52 ++ .../phoenix/expression/function/LowerFunction.java | 7 ++- .../phoenix/expression/function/UpperFunction.java | 7 ++- 3 files changed, 64 insertions(+), 2 deletions(-)
[phoenix] branch 4.16 updated: PHOENIX-5072 Cursor Query Loops Eternally with Local Index, Returns Fine Without It
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 4.16 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.16 by this push: new a166b33 PHOENIX-5072 Cursor Query Loops Eternally with Local Index, Returns Fine Without It a166b33 is described below commit a166b33f698f45ba2d2ef873419effe93a3d0606 Author: Richard Antal AuthorDate: Tue Aug 17 16:38:16 2021 +0200 PHOENIX-5072 Cursor Query Loops Eternally with Local Index, Returns Fine Without It --- .../end2end/CursorWithRowValueConstructorIT.java | 92 ++ .../phoenix/compile/DeclareCursorCompiler.java | 8 +- 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java index e5457d6..6e91d1f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java @@ -40,10 +40,13 @@ import java.sql.Date; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.sql.Statement; import java.sql.SQLException; import java.sql.Timestamp; +import java.text.DecimalFormat; import java.util.Properties; import java.util.Random; +import java.util.UUID; import org.apache.phoenix.util.CursorUtil; import org.apache.phoenix.util.DateUtil; @@ -669,4 +672,93 @@ public class CursorWithRowValueConstructorIT extends ParallelStatsDisabledIT { conn.close(); } } + +@Test +public void testCursorWithIndex() throws Exception { +String cursorName = generateUniqueName(); +String tableName = generateUniqueName(); +String indexName = generateUniqueName(); +Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); +Connection conn = DriverManager.getConnection(getUrl(), props); + +Statement stmt = conn.createStatement(); + +String createTable = "CREATE TABLE IF NOT EXISTS " + tableName +"\n" + +"( \n" + +" ID VARCHARNOT NULL,\n" + +" NAME VARCHAR,\n" + +" ANOTHER_VALUE VARCHAR,\n" + +" TRANSACTION_TIME TIMESTAMP ,\n" + +" CONSTRAINT pk PRIMARY KEY(ID)\n" + +")"; +stmt.execute(createTable); + +//Creating an index +String createIndex = "CREATE LOCAL INDEX " + indexName + " ON " + tableName + "(NAME, TRANSACTION_TIME DESC) INCLUDE(ANOTHER_VALUE)"; +stmt.execute(createIndex); + +//Insert Some Items. +DecimalFormat dmf = new DecimalFormat(""); +final String prefix = "ReferenceData.Country/"; +for (int i = 0; i < 10; i++) +{ +for (int j = 0; j < 10; j++) +{ +PreparedStatement prstmt = conn.prepareStatement("UPSERT INTO " + tableName + " VALUES(?,?,?,?)"); +prstmt.setString(1, UUID.randomUUID().toString()); +prstmt.setString(2,prefix + dmf.format(i+j*1000)); +prstmt.setString(3,UUID.randomUUID().toString()); +prstmt.setTimestamp(4, new Timestamp(System.currentTimeMillis())); +prstmt.execute(); +conn.commit(); +prstmt.close(); +} +} + +String countSQL = "SELECT COUNT(1) AS TOTAL_ITEMS FROM " + tableName + " where NAME like 'ReferenceData.Country/2%' "; +ResultSet rs = stmt.executeQuery(countSQL); +rs.next(); +final int totalCount = rs.getInt("TOTAL_ITEMS"); +rs.close(); + +//Now a Cursor +String cursorSQL = "DECLARE " + cursorName + " CURSOR FOR SELECT NAME,ANOTHER_VALUE FROM " ++ tableName + " where NAME like 'ReferenceData.Country/2%' ORDER BY TRANSACTION_TIME DESC"; +PreparedStatement cursorStatement = conn.prepareStatement(cursorSQL); +cursorStatement.execute(); +PreparedStatement openCursorStatement = conn.prepareStatement("OPEN " + cursorName); +openCursorStatement.execute(); + +rs = stmt.executeQuery("EXPLAIN FETCH NEXT 10 ROWS FROM " + cursorName); +rs.next(); +assertTrue(rs.getString(1) +.contains("CLIENT PARALLEL 1-WAY RANGE SCAN")); +PreparedStatement next10Rows = conn.prepareStat
[phoenix] branch 4.x updated: PHOENIX-5072 Cursor Query Loops Eternally with Local Index, Returns Fine Without It
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 4.x in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x by this push: new 5eadf8f PHOENIX-5072 Cursor Query Loops Eternally with Local Index, Returns Fine Without It 5eadf8f is described below commit 5eadf8f15f79968a31dde5b361a5b303f896f08b Author: Richard Antal AuthorDate: Tue Aug 17 16:38:16 2021 +0200 PHOENIX-5072 Cursor Query Loops Eternally with Local Index, Returns Fine Without It --- .../end2end/CursorWithRowValueConstructorIT.java | 92 ++ .../phoenix/compile/DeclareCursorCompiler.java | 8 +- 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java index e5457d6..6e91d1f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java @@ -40,10 +40,13 @@ import java.sql.Date; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.sql.Statement; import java.sql.SQLException; import java.sql.Timestamp; +import java.text.DecimalFormat; import java.util.Properties; import java.util.Random; +import java.util.UUID; import org.apache.phoenix.util.CursorUtil; import org.apache.phoenix.util.DateUtil; @@ -669,4 +672,93 @@ public class CursorWithRowValueConstructorIT extends ParallelStatsDisabledIT { conn.close(); } } + +@Test +public void testCursorWithIndex() throws Exception { +String cursorName = generateUniqueName(); +String tableName = generateUniqueName(); +String indexName = generateUniqueName(); +Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); +Connection conn = DriverManager.getConnection(getUrl(), props); + +Statement stmt = conn.createStatement(); + +String createTable = "CREATE TABLE IF NOT EXISTS " + tableName +"\n" + +"( \n" + +" ID VARCHARNOT NULL,\n" + +" NAME VARCHAR,\n" + +" ANOTHER_VALUE VARCHAR,\n" + +" TRANSACTION_TIME TIMESTAMP ,\n" + +" CONSTRAINT pk PRIMARY KEY(ID)\n" + +")"; +stmt.execute(createTable); + +//Creating an index +String createIndex = "CREATE LOCAL INDEX " + indexName + " ON " + tableName + "(NAME, TRANSACTION_TIME DESC) INCLUDE(ANOTHER_VALUE)"; +stmt.execute(createIndex); + +//Insert Some Items. +DecimalFormat dmf = new DecimalFormat(""); +final String prefix = "ReferenceData.Country/"; +for (int i = 0; i < 10; i++) +{ +for (int j = 0; j < 10; j++) +{ +PreparedStatement prstmt = conn.prepareStatement("UPSERT INTO " + tableName + " VALUES(?,?,?,?)"); +prstmt.setString(1, UUID.randomUUID().toString()); +prstmt.setString(2,prefix + dmf.format(i+j*1000)); +prstmt.setString(3,UUID.randomUUID().toString()); +prstmt.setTimestamp(4, new Timestamp(System.currentTimeMillis())); +prstmt.execute(); +conn.commit(); +prstmt.close(); +} +} + +String countSQL = "SELECT COUNT(1) AS TOTAL_ITEMS FROM " + tableName + " where NAME like 'ReferenceData.Country/2%' "; +ResultSet rs = stmt.executeQuery(countSQL); +rs.next(); +final int totalCount = rs.getInt("TOTAL_ITEMS"); +rs.close(); + +//Now a Cursor +String cursorSQL = "DECLARE " + cursorName + " CURSOR FOR SELECT NAME,ANOTHER_VALUE FROM " ++ tableName + " where NAME like 'ReferenceData.Country/2%' ORDER BY TRANSACTION_TIME DESC"; +PreparedStatement cursorStatement = conn.prepareStatement(cursorSQL); +cursorStatement.execute(); +PreparedStatement openCursorStatement = conn.prepareStatement("OPEN " + cursorName); +openCursorStatement.execute(); + +rs = stmt.executeQuery("EXPLAIN FETCH NEXT 10 ROWS FROM " + cursorName); +rs.next(); +assertTrue(rs.getString(1) +.contains("CLIENT PARALLEL 1-WAY RANGE SCAN")); +PreparedStatement next10Rows = conn.prepareStat
[phoenix] branch 5.1 updated: PHOENIX-5072 Cursor Query Loops Eternally with Local Index, Returns Fine Without It
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new 838ec34 PHOENIX-5072 Cursor Query Loops Eternally with Local Index, Returns Fine Without It 838ec34 is described below commit 838ec3441ef5d4e289c79083826897ed149532a1 Author: Richard Antal AuthorDate: Tue Aug 17 16:38:16 2021 +0200 PHOENIX-5072 Cursor Query Loops Eternally with Local Index, Returns Fine Without It --- .../end2end/CursorWithRowValueConstructorIT.java | 92 ++ .../phoenix/compile/DeclareCursorCompiler.java | 8 +- 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java index e5457d6..6e91d1f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CursorWithRowValueConstructorIT.java @@ -40,10 +40,13 @@ import java.sql.Date; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.sql.Statement; import java.sql.SQLException; import java.sql.Timestamp; +import java.text.DecimalFormat; import java.util.Properties; import java.util.Random; +import java.util.UUID; import org.apache.phoenix.util.CursorUtil; import org.apache.phoenix.util.DateUtil; @@ -669,4 +672,93 @@ public class CursorWithRowValueConstructorIT extends ParallelStatsDisabledIT { conn.close(); } } + +@Test +public void testCursorWithIndex() throws Exception { +String cursorName = generateUniqueName(); +String tableName = generateUniqueName(); +String indexName = generateUniqueName(); +Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); +Connection conn = DriverManager.getConnection(getUrl(), props); + +Statement stmt = conn.createStatement(); + +String createTable = "CREATE TABLE IF NOT EXISTS " + tableName +"\n" + +"( \n" + +" ID VARCHARNOT NULL,\n" + +" NAME VARCHAR,\n" + +" ANOTHER_VALUE VARCHAR,\n" + +" TRANSACTION_TIME TIMESTAMP ,\n" + +" CONSTRAINT pk PRIMARY KEY(ID)\n" + +")"; +stmt.execute(createTable); + +//Creating an index +String createIndex = "CREATE LOCAL INDEX " + indexName + " ON " + tableName + "(NAME, TRANSACTION_TIME DESC) INCLUDE(ANOTHER_VALUE)"; +stmt.execute(createIndex); + +//Insert Some Items. +DecimalFormat dmf = new DecimalFormat(""); +final String prefix = "ReferenceData.Country/"; +for (int i = 0; i < 10; i++) +{ +for (int j = 0; j < 10; j++) +{ +PreparedStatement prstmt = conn.prepareStatement("UPSERT INTO " + tableName + " VALUES(?,?,?,?)"); +prstmt.setString(1, UUID.randomUUID().toString()); +prstmt.setString(2,prefix + dmf.format(i+j*1000)); +prstmt.setString(3,UUID.randomUUID().toString()); +prstmt.setTimestamp(4, new Timestamp(System.currentTimeMillis())); +prstmt.execute(); +conn.commit(); +prstmt.close(); +} +} + +String countSQL = "SELECT COUNT(1) AS TOTAL_ITEMS FROM " + tableName + " where NAME like 'ReferenceData.Country/2%' "; +ResultSet rs = stmt.executeQuery(countSQL); +rs.next(); +final int totalCount = rs.getInt("TOTAL_ITEMS"); +rs.close(); + +//Now a Cursor +String cursorSQL = "DECLARE " + cursorName + " CURSOR FOR SELECT NAME,ANOTHER_VALUE FROM " ++ tableName + " where NAME like 'ReferenceData.Country/2%' ORDER BY TRANSACTION_TIME DESC"; +PreparedStatement cursorStatement = conn.prepareStatement(cursorSQL); +cursorStatement.execute(); +PreparedStatement openCursorStatement = conn.prepareStatement("OPEN " + cursorName); +openCursorStatement.execute(); + +rs = stmt.executeQuery("EXPLAIN FETCH NEXT 10 ROWS FROM " + cursorName); +rs.next(); +assertTrue(rs.getString(1) +.contains("CLIENT PARALLEL 1-WAY RANGE SCAN")); +PreparedStatement next10Rows = conn.prepareStat
[phoenix] branch master updated (e84232b -> c55b472)
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git. from e84232b PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey add c55b472 PHOENIX-5072 Cursor Query Loops Eternally with Local Index, Returns Fine Without It No new revisions were added by this update. Summary of changes: .../end2end/CursorWithRowValueConstructorIT.java | 92 ++ .../phoenix/compile/DeclareCursorCompiler.java | 8 +- 2 files changed, 98 insertions(+), 2 deletions(-)
[phoenix] branch 4.16 updated: PHOENIX-6486 Phoenix uses inconsistent chronologies internally, breaking pre-Gregorian date handling
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 4.16 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.16 by this push: new 495b008 PHOENIX-6486 Phoenix uses inconsistent chronologies internally, breaking pre-Gregorian date handling 495b008 is described below commit 495b008076dac1cd912f57fa07e01a96f0a8ea83 Author: Richard Antal AuthorDate: Wed Aug 25 11:48:36 2021 +0200 PHOENIX-6486 Phoenix uses inconsistent chronologies internally, breaking pre-Gregorian date handling --- .../org/apache/phoenix/end2end/DateTimeIT.java | 113 - .../expression/function/DayOfMonthFunction.java| 3 +- .../expression/function/DayOfWeekFunction.java | 3 +- .../expression/function/DayOfYearFunction.java | 3 +- .../phoenix/expression/function/HourFunction.java | 5 +- .../expression/function/MinuteFunction.java| 5 +- .../phoenix/expression/function/MonthFunction.java | 3 +- .../function/RoundJodaDateExpression.java | 2 +- .../expression/function/SecondFunction.java| 5 +- .../phoenix/expression/function/WeekFunction.java | 3 +- .../phoenix/expression/function/YearFunction.java | 3 +- .../java/org/apache/phoenix/util/DateUtil.java | 31 +++--- 12 files changed, 154 insertions(+), 25 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java index a1f99df..7826484 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java @@ -35,6 +35,7 @@ import static org.apache.phoenix.util.TestUtil.ROW9; import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -51,10 +52,14 @@ import java.sql.Time; import java.sql.Timestamp; import java.sql.Types; import java.text.Format; +import java.time.LocalDate; +import java.time.ZoneOffset; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.Properties; import java.util.TimeZone; +import java.util.List; +import java.util.Arrays; import org.apache.commons.lang.time.FastDateFormat; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; @@ -559,7 +564,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT { @Test public void testYearFunctionDate() throws SQLException { -assertEquals(2008, callYearFunction("\"YEAR\"(TO_DATE('2008-01-01', '-MM-dd', 'local'))")); +assertEquals(2008, callYearFunction("\"YEAR\"(TO_DATE('2008-01-01', '-MM-dd'))")); assertEquals(2004, callYearFunction("\"YEAR\"(TO_DATE('2004-12-13 10:13:18', '-MM-dd hh:mm:ss'))")); @@ -1911,6 +1916,112 @@ public class DateTimeIT extends ParallelStatsDisabledIT { } } +private String getFormattedDate(List dateList) { +return String.join("-", dateList.subList(0, 3)) + " " ++ String.join(":", dateList.subList(3, 6)) + "." + dateList.get(6); +} + +@Test +public void testAncientDates() throws Exception { +Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); +Connection conn = DriverManager.getConnection(url, props); +Statement stmt = conn.createStatement(); +String tableName = generateUniqueName(); + +List date1list = Arrays.asList("0010", "10", "10", "10", "10", "10", "111"); +List date2list = Arrays.asList("1001", "02", "03", "04", "05", "06", "000"); +List date3list = Arrays.asList("0001", "12", "31", "23", "59", "59", "000"); +List> dateLists = Arrays.asList(date1list, date2list, date3list, date2list); + +String date1 = getFormattedDate(date1list); // 0010-10-10 10:10:10.111 +String date2 = getFormattedDate(date2list); // 1000-02-03 04:05:06.000 +String date3 = getFormattedDate(date3list); // 0001-12-31 23:59:59.000 +List dates = Arrays.asList(date1, date2, date3, date2); + + +stmt.execute("CREATE TABLE " + tableName + " ( id INTEGER not null PRIMARY KEY," + +" date DATE, time TIME, timestamp TIMESTAMP)"); + +stmt.execute("UPSERT INTO " + tableName + " VALUES(1, TO_DATE('
[phoenix] branch 5.1 updated: PHOENIX-6486 Phoenix uses inconsistent chronologies internally, breaking pre-Gregorian date handling
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new 5a02b3d PHOENIX-6486 Phoenix uses inconsistent chronologies internally, breaking pre-Gregorian date handling 5a02b3d is described below commit 5a02b3dad96088c5128fdff92cdd86da60b1aa4b Author: Richard Antal AuthorDate: Wed Aug 25 11:48:36 2021 +0200 PHOENIX-6486 Phoenix uses inconsistent chronologies internally, breaking pre-Gregorian date handling --- .../org/apache/phoenix/end2end/DateTimeIT.java | 212 - .../expression/function/DayOfMonthFunction.java| 3 +- .../expression/function/DayOfWeekFunction.java | 3 +- .../expression/function/DayOfYearFunction.java | 3 +- .../phoenix/expression/function/HourFunction.java | 5 +- .../expression/function/MinuteFunction.java| 5 +- .../phoenix/expression/function/MonthFunction.java | 3 +- .../function/RoundJodaDateExpression.java | 2 +- .../expression/function/SecondFunction.java| 5 +- .../phoenix/expression/function/WeekFunction.java | 3 +- .../phoenix/expression/function/YearFunction.java | 3 +- .../java/org/apache/phoenix/util/DateUtil.java | 31 +-- 12 files changed, 253 insertions(+), 25 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java index 98c0e30..a0d017f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java @@ -35,6 +35,7 @@ import static org.apache.phoenix.util.TestUtil.ROW9; import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -52,10 +53,13 @@ import java.sql.Timestamp; import java.sql.Types; import java.text.Format; import java.time.LocalDate; +import java.time.ZoneOffset; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.Properties; import java.util.TimeZone; +import java.util.List; +import java.util.Arrays; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; @@ -560,7 +564,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT { @Test public void testYearFunctionDate() throws SQLException { -assertEquals(2008, callYearFunction("\"YEAR\"(TO_DATE('2008-01-01', '-MM-dd', 'local'))")); +assertEquals(2008, callYearFunction("\"YEAR\"(TO_DATE('2008-01-01', '-MM-dd'))")); assertEquals(2004, callYearFunction("\"YEAR\"(TO_DATE('2004-12-13 10:13:18', '-MM-dd hh:mm:ss'))")); @@ -1939,6 +1943,212 @@ public class DateTimeIT extends ParallelStatsDisabledIT { } } +private String getFormattedDate(List dateList) { +return String.join("-", dateList.subList(0, 3)) + " " ++ String.join(":", dateList.subList(3, 6)) + "." + dateList.get(6); +} + +@Test +public void testAncientDates() throws Exception { +Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); +Connection conn = DriverManager.getConnection(url, props); +Statement stmt = conn.createStatement(); +String tableName = generateUniqueName(); + +List date1list = Arrays.asList("0010", "10", "10", "10", "10", "10", "111"); +List date2list = Arrays.asList("1001", "02", "03", "04", "05", "06", "000"); +List date3list = Arrays.asList("0001", "12", "31", "23", "59", "59", "000"); +List> dateLists = Arrays.asList(date1list, date2list, date3list, date2list); + +String date1 = getFormattedDate(date1list); // 0010-10-10 10:10:10.111 +String date2 = getFormattedDate(date2list); // 1000-02-03 04:05:06.000 +String date3 = getFormattedDate(date3list); // 0001-12-31 23:59:59.000 +List dates = Arrays.asList(date1, date2, date3, date2); + + +stmt.execute("CREATE TABLE " + tableName + " ( id INTEGER not null PRIMARY KEY," + +" date DATE, time TIME, timestamp TIMESTAMP)"); + +stmt.execute("UPSERT INTO " + tableName + " VALUES(1, TO_DATE('" + date1 +
[phoenix] branch 4.x updated: PHOENIX-6486 Phoenix uses inconsistent chronologies internally, breaking pre-Gregorian date handling
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 4.x in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x by this push: new 937c0d1 PHOENIX-6486 Phoenix uses inconsistent chronologies internally, breaking pre-Gregorian date handling 937c0d1 is described below commit 937c0d182bd0393d9b3565d71b77fffc56d39883 Author: Richard Antal AuthorDate: Wed Aug 25 11:48:36 2021 +0200 PHOENIX-6486 Phoenix uses inconsistent chronologies internally, breaking pre-Gregorian date handling --- .../org/apache/phoenix/end2end/DateTimeIT.java | 113 - .../expression/function/DayOfMonthFunction.java| 3 +- .../expression/function/DayOfWeekFunction.java | 3 +- .../expression/function/DayOfYearFunction.java | 3 +- .../phoenix/expression/function/HourFunction.java | 5 +- .../expression/function/MinuteFunction.java| 5 +- .../phoenix/expression/function/MonthFunction.java | 3 +- .../function/RoundJodaDateExpression.java | 2 +- .../expression/function/SecondFunction.java| 5 +- .../phoenix/expression/function/WeekFunction.java | 3 +- .../phoenix/expression/function/YearFunction.java | 3 +- .../java/org/apache/phoenix/util/DateUtil.java | 31 +++--- 12 files changed, 154 insertions(+), 25 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java index a1f99df..7826484 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java @@ -35,6 +35,7 @@ import static org.apache.phoenix.util.TestUtil.ROW9; import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -51,10 +52,14 @@ import java.sql.Time; import java.sql.Timestamp; import java.sql.Types; import java.text.Format; +import java.time.LocalDate; +import java.time.ZoneOffset; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.Properties; import java.util.TimeZone; +import java.util.List; +import java.util.Arrays; import org.apache.commons.lang.time.FastDateFormat; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; @@ -559,7 +564,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT { @Test public void testYearFunctionDate() throws SQLException { -assertEquals(2008, callYearFunction("\"YEAR\"(TO_DATE('2008-01-01', '-MM-dd', 'local'))")); +assertEquals(2008, callYearFunction("\"YEAR\"(TO_DATE('2008-01-01', '-MM-dd'))")); assertEquals(2004, callYearFunction("\"YEAR\"(TO_DATE('2004-12-13 10:13:18', '-MM-dd hh:mm:ss'))")); @@ -1911,6 +1916,112 @@ public class DateTimeIT extends ParallelStatsDisabledIT { } } +private String getFormattedDate(List dateList) { +return String.join("-", dateList.subList(0, 3)) + " " ++ String.join(":", dateList.subList(3, 6)) + "." + dateList.get(6); +} + +@Test +public void testAncientDates() throws Exception { +Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); +Connection conn = DriverManager.getConnection(url, props); +Statement stmt = conn.createStatement(); +String tableName = generateUniqueName(); + +List date1list = Arrays.asList("0010", "10", "10", "10", "10", "10", "111"); +List date2list = Arrays.asList("1001", "02", "03", "04", "05", "06", "000"); +List date3list = Arrays.asList("0001", "12", "31", "23", "59", "59", "000"); +List> dateLists = Arrays.asList(date1list, date2list, date3list, date2list); + +String date1 = getFormattedDate(date1list); // 0010-10-10 10:10:10.111 +String date2 = getFormattedDate(date2list); // 1000-02-03 04:05:06.000 +String date3 = getFormattedDate(date3list); // 0001-12-31 23:59:59.000 +List dates = Arrays.asList(date1, date2, date3, date2); + + +stmt.execute("CREATE TABLE " + tableName + " ( id INTEGER not null PRIMARY KEY," + +" date DATE, time TIME, timestamp TIMESTAMP)"); + +stmt.execute("UPSERT INTO " + tableName + " VALUES(1, TO_DATE('
[phoenix] branch master updated: PHOENIX-6486 Phoenix uses inconsistent chronologies internally, breaking pre-Gregorian date handling
This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new 67cef07 PHOENIX-6486 Phoenix uses inconsistent chronologies internally, breaking pre-Gregorian date handling 67cef07 is described below commit 67cef07011426bbf78fa271530fbebd6491935ff Author: Richard Antal AuthorDate: Wed Aug 25 11:48:36 2021 +0200 PHOENIX-6486 Phoenix uses inconsistent chronologies internally, breaking pre-Gregorian date handling --- .../org/apache/phoenix/end2end/DateTimeIT.java | 212 - .../expression/function/DayOfMonthFunction.java| 3 +- .../expression/function/DayOfWeekFunction.java | 3 +- .../expression/function/DayOfYearFunction.java | 3 +- .../phoenix/expression/function/HourFunction.java | 5 +- .../expression/function/MinuteFunction.java| 5 +- .../phoenix/expression/function/MonthFunction.java | 3 +- .../function/RoundJodaDateExpression.java | 2 +- .../expression/function/SecondFunction.java| 5 +- .../phoenix/expression/function/WeekFunction.java | 3 +- .../phoenix/expression/function/YearFunction.java | 3 +- .../java/org/apache/phoenix/util/DateUtil.java | 31 +-- 12 files changed, 253 insertions(+), 25 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java index 98c0e30..a0d017f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java @@ -35,6 +35,7 @@ import static org.apache.phoenix.util.TestUtil.ROW9; import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -52,10 +53,13 @@ import java.sql.Timestamp; import java.sql.Types; import java.text.Format; import java.time.LocalDate; +import java.time.ZoneOffset; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.Properties; import java.util.TimeZone; +import java.util.List; +import java.util.Arrays; import org.apache.commons.lang3.time.FastDateFormat; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; @@ -560,7 +564,7 @@ public class DateTimeIT extends ParallelStatsDisabledIT { @Test public void testYearFunctionDate() throws SQLException { -assertEquals(2008, callYearFunction("\"YEAR\"(TO_DATE('2008-01-01', '-MM-dd', 'local'))")); +assertEquals(2008, callYearFunction("\"YEAR\"(TO_DATE('2008-01-01', '-MM-dd'))")); assertEquals(2004, callYearFunction("\"YEAR\"(TO_DATE('2004-12-13 10:13:18', '-MM-dd hh:mm:ss'))")); @@ -1939,6 +1943,212 @@ public class DateTimeIT extends ParallelStatsDisabledIT { } } +private String getFormattedDate(List dateList) { +return String.join("-", dateList.subList(0, 3)) + " " ++ String.join(":", dateList.subList(3, 6)) + "." + dateList.get(6); +} + +@Test +public void testAncientDates() throws Exception { +Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); +Connection conn = DriverManager.getConnection(url, props); +Statement stmt = conn.createStatement(); +String tableName = generateUniqueName(); + +List date1list = Arrays.asList("0010", "10", "10", "10", "10", "10", "111"); +List date2list = Arrays.asList("1001", "02", "03", "04", "05", "06", "000"); +List date3list = Arrays.asList("0001", "12", "31", "23", "59", "59", "000"); +List> dateLists = Arrays.asList(date1list, date2list, date3list, date2list); + +String date1 = getFormattedDate(date1list); // 0010-10-10 10:10:10.111 +String date2 = getFormattedDate(date2list); // 1000-02-03 04:05:06.000 +String date3 = getFormattedDate(date3list); // 0001-12-31 23:59:59.000 +List dates = Arrays.asList(date1, date2, date3, date2); + + +stmt.execute("CREATE TABLE " + tableName + " ( id INTEGER not null PRIMARY KEY," + +" date DATE, time TIME, timestamp TIMESTAMP)"); + +stmt.execute("UPSERT INTO " + tableName + " VALUES(1, TO_DATE('