svn commit: r1894008 [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=1894008=1894007=1894008=diff
==
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Thu Oct 7 20:53:16 2021
@@ -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.
svn commit: r1894008 [1/3] - in /phoenix/site/publish/language: datatypes.html functions.html index.html
Author: elserj Date: Thu Oct 7 20:53:16 2021 New Revision: 1894008 URL: http://svn.apache.org/viewvc?rev=1894008=rev Log: Restoring language pages 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=1894008=1894007=1894008=diff == --- phoenix/site/publish/language/datatypes.html (original) +++ phoenix/site/publish/language/datatypes.html Thu Oct 7 20:53:16 2021 @@ -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
svn commit: r1894008 [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=1894008=1894007=1894008=diff
==
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Thu Oct 7 20:53:16 2021
@@ -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
svn commit: r1891290 - in /phoenix/site: publish/ publish/language/ source/src/site/markdown/
Author: elserj Date: Tue Jul 6 02:14:00 2021 New Revision: 1891290 URL: http://svn.apache.org/viewvc?rev=1891290=rev Log: PHOENIX-6503 Update News for recent releases (Richárd Antal) 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/index.md phoenix/site/source/src/site/markdown/news.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=1891290=1891289=1891290=diff == --- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original) +++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Tue Jul 6 02:14:00 2021 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/array_type.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/array_type.html?rev=1891290=1891289=1891290=diff == --- phoenix/site/publish/array_type.html (original) +++ phoenix/site/publish/array_type.html Tue Jul 6 02:14:00 2021 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/atomic_upsert.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/atomic_upsert.html?rev=1891290=1891289=1891290=diff == --- phoenix/site/publish/atomic_upsert.html (original) +++ phoenix/site/publish/atomic_upsert.html Tue Jul 6 02:14:00 2021 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/building.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building.html?rev=1891290=1891289=1891290=diff == --- phoenix/site/publish/building.html (original) +++ phoenix/site/publish/building.html Tue Jul 6 02:14:00 2021 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/building_website.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building_website.html?rev=1891290=1891289=1891290=diff == --- phoenix/site/publish/building_website.html (original) +++ phoenix/site/publish/building_website.html Tue Jul 6 02:14:00
svn commit: r47858 - /dev/phoenix/phoenix-4.16.1RC11/ /release/phoenix/phoenix-4.16.1/
Author: elserj Date: Fri May 21 16:15:47 2021 New Revision: 47858 Log: Publish Phoenix 4.16.1 Added: release/phoenix/phoenix-4.16.1/ - copied from r47857, dev/phoenix/phoenix-4.16.1RC11/ Removed: dev/phoenix/phoenix-4.16.1RC11/
svn commit: r47672 - /dev/phoenix/phoenix-tephra-0.16.1RC1/ /release/phoenix/phoenix-tephra-0.16.1/
Author: elserj Date: Thu May 13 01:31:27 2021 New Revision: 47672 Log: Publish Tephra 0.16.1 Added: release/phoenix/phoenix-tephra-0.16.1/ - copied from r47671, dev/phoenix/phoenix-tephra-0.16.1RC1/ Removed: dev/phoenix/phoenix-tephra-0.16.1RC1/
[phoenix-queryserver] branch master updated: PHOENIX-6459 Try to use a Session to pass along any cookies the serve… (#60)
This is an automated email from the ASF dual-hosted git repository.
elserj 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 6bfb0b9 PHOENIX-6459 Try to use a Session to pass along any cookies
the serve… (#60)
6bfb0b9 is described below
commit 6bfb0b94c37a999fc3e4344e6b8d965083d6d1d4
Author: Josh Elser
AuthorDate: Thu May 6 12:07:17 2021 -0400
PHOENIX-6459 Try to use a Session to pass along any cookies the serve… (#60)
The Requests documentation also alludes to performance benefit due to
leaving the existing connection open (rather than re-connecting each time)
https://docs.python-requests.org/en/master/user/advanced/#session-objects
---
python-phoenixdb/phoenixdb/avatica/client.py | 21 +++--
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/python-phoenixdb/phoenixdb/avatica/client.py
b/python-phoenixdb/phoenixdb/avatica/client.py
index a1f502c..5c96586 100644
--- a/python-phoenixdb/phoenixdb/avatica/client.py
+++ b/python-phoenixdb/phoenixdb/avatica/client.py
@@ -149,6 +149,7 @@ class AvaticaClient(object):
self.auth = auth
self.verify = verify
self.connection = None
+self.session = None
def connect(self):
"""This method used to open a persistent TCP connection
@@ -160,20 +161,28 @@ class AvaticaClient(object):
pass
def _post_request(self, body, headers):
+# Create the session if we haven't before
+if not self.session:
+logger.debug("Creating a new Session")
+self.session = requests.Session()
+self.session.headers.update(headers)
+self.session.stream = True
+if self.auth is not None:
+self.session.auth = self.auth
+
retry_count = self.max_retries
while True:
-logger.debug("POST %s %r %r", self.url.geturl(), body, headers)
+logger.debug("POST %s %r %r", self.url.geturl(), body,
self.session.headers)
-requestArgs = {'data': body, 'stream': True, 'headers': headers}
-
-if self.auth is not None:
-requestArgs.update(auth=self.auth)
+requestArgs = {'data': body}
+# Setting verify on the Session is not the same as setting it
+# as a request arg
if self.verify is not None:
requestArgs.update(verify=self.verify)
try:
-response = requests.request('post', self.url.geturl(),
**requestArgs)
+response = self.session.post(self.url.geturl(), **requestArgs)
except requests.HTTPError as e:
if retry_count > 0:
[phoenix-queryserver] branch master updated: PHOENIX-5778 Remove the dependency of KeyStoreTestUtil
This is an automated email from the ASF dual-hosted git repository.
elserj 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 b25ab3e PHOENIX-5778 Remove the dependency of KeyStoreTestUtil
b25ab3e is described below
commit b25ab3e2c75229a1a75d94f5e1cfe6d5cfa91282
Author: Guanghao Zhang
AuthorDate: Fri Jul 3 20:55:44 2020 -0400
PHOENIX-5778 Remove the dependency of KeyStoreTestUtil
Co-authored-by: Josh Elser
Closes #22, closes #41
---
phoenix-queryserver-it/pom.xml | 7 +-
.../phoenix/end2end/QueryServerEnvironment.java| 5 +-
.../end2end/SecureQueryServerPhoenixDBIT.java | 5 +-
.../java/org/apache/phoenix/end2end/TlsUtil.java | 268 -
pom.xml| 6 +
5 files changed, 275 insertions(+), 16 deletions(-)
diff --git a/phoenix-queryserver-it/pom.xml b/phoenix-queryserver-it/pom.xml
index 6979f79..961d65b 100644
--- a/phoenix-queryserver-it/pom.xml
+++ b/phoenix-queryserver-it/pom.xml
@@ -207,6 +207,11 @@
hadoop-common
test-jar
test
-
+
+
+ bouncycastle
+ bcprov-jdk15
+ test
+
diff --git
a/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerEnvironment.java
b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerEnvironment.java
index 0d1c55f..7bb6c9e 100644
---
a/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerEnvironment.java
+++
b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerEnvironment.java
@@ -33,7 +33,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.LocalHBaseCluster;
-import org.apache.hadoop.hbase.http.ssl.KeyStoreTestUtil;
import org.apache.hadoop.hbase.security.HBaseKerberosUtils;
import org.apache.hadoop.hbase.util.FSUtils;
import org.apache.hadoop.hdfs.DFSConfigKeys;
@@ -179,8 +178,8 @@ public class QueryServerEnvironment {
// Generate SSL certs
File keystoresDir = new
File(UTIL.getDataTestDir("keystore").toUri().getPath());
keystoresDir.mkdirs();
-String sslConfDir =
KeyStoreTestUtil.getClasspathDir(QueryServerEnvironment.class);
-KeyStoreTestUtil.setupSSLConfig(keystoresDir.getAbsolutePath(),
sslConfDir, conf, false);
+String sslConfDir =
TlsUtil.getClasspathDir(QueryServerEnvironment.class);
+TlsUtil.setupSSLConfig(keystoresDir.getAbsolutePath(), sslConfDir,
conf, false);
// Magic flag to tell hdfs to not fail on using ports above 1024
conf.setBoolean("ignore.secure.ports.for.testing", true);
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 2be195a..bab190c 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
@@ -50,7 +50,6 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.LocalHBaseCluster;
import org.apache.hadoop.hbase.client.TestHCM.SleepAndFailFirstTime;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
-import org.apache.hadoop.hbase.http.ssl.KeyStoreTestUtil;
import org.apache.hadoop.hbase.security.HBaseKerberosUtils;
import org.apache.hadoop.hbase.security.token.TokenProvider;
import org.apache.hadoop.hbase.util.FSUtils;
@@ -160,8 +159,8 @@ public class SecureQueryServerPhoenixDBIT {
// Generate SSL certs
File keystoresDir = new
File(UTIL.getDataTestDir("keystore").toUri().getPath());
keystoresDir.mkdirs();
-String sslConfDir =
KeyStoreTestUtil.getClasspathDir(SecureQueryServerPhoenixDBIT.class);
-KeyStoreTestUtil.setupSSLConfig(keystoresDir.getAbsolutePath(),
sslConfDir, conf, false);
+String sslConfDir =
TlsUtil.getClasspathDir(SecureQueryServerPhoenixDBIT.class);
+TlsUtil.setupSSLConfig(keystoresDir.getAbsolutePath(), sslConfDir,
conf, false);
// Magic flag to tell hdfs to not fail on using ports above 1024
conf.setBoolean("ignore.secure.ports.for.testing", true);
diff --git
a/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/TlsUtil.java
b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/TlsUtil.java
index de757b8..ef4fe9c 100644
--- a/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/TlsUtil.java
+++ b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/TlsUtil.java
@@ -11,15 +11,38 @@
package org.apache.phoenix.
[phoenix-queryserver] branch master updated: PHOENIX-5901 Fix licensing in preparation for first python release
This is an automated email from the ASF dual-hosted git repository.
elserj 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 7c87632 PHOENIX-5901 Fix licensing in preparation for first python
release
7c87632 is described below
commit 7c87632eb63bb45d934ceec850adeab886f580a3
Author: Josh Elser
AuthorDate: Tue Jun 16 16:45:12 2020 -0400
PHOENIX-5901 Fix licensing in preparation for first python release
Use RAT to report on our source code. RAT on the CLI apparently can't
exclude things based on path, so the protobuf-generated code was
manually edited.
Flattens the python driver directory structure and consolidates the
two sets of README files into just one. The README was also updated
to include details about SQLAlchemy support.
Closes #39
Signed-off-by: Istvan Toth
---
.../src/it/bin/test_phoenixdb.sh | 2 +-
.../end2end/SecureQueryServerPhoenixDBIT.java | 59 --
.../src/it/resources/log4j.properties | 3 +
python-phoenixdb/.gitignore| 13 ++
{python => python-phoenixdb}/.gitlab-ci.yml| 0
.../__init__.py => python-phoenixdb/Dockerfile | 10 +-
.../tox.ini => python-phoenixdb/Dockerfile-pqs | 19 +-
python-phoenixdb/LICENSE | 202 +
{python/phoenixdb => python-phoenixdb}/NEWS.rst| 0
python-phoenixdb/NOTICE| 10 +
{python/phoenixdb => python-phoenixdb}/README.rst | 23 ++-
.../phoenixdb => python-phoenixdb}/RELEASING.rst | 0
.../ci/build-env/Dockerfile| 8 +-
.../ci/phoenix/Dockerfile | 15 ++
.../ci/phoenix/docker-entrypoint.sh| 37 ++--
python-phoenixdb/ci/phoenix/hbase-site.xml | 29 +++
.../dev-support/cache-apache-project-artifact.sh | 139 ++
python-phoenixdb/dev-support/rat-excludes.txt | 4 +
.../dev-support/run-source-ratcheck.sh | 44 +
.../phoenixdb => python-phoenixdb}/doc/Makefile| 15 ++
python-phoenixdb/doc/api.rst | 46 +
{python/phoenixdb => python-phoenixdb}/doc/conf.py | 15 ++
python-phoenixdb/doc/index.rst | 41 +
python-phoenixdb/doc/versions.rst | 19 ++
.../examples/basic.py | 0
.../phoenixdb => python-phoenixdb}/gen-protobuf.sh | 20 ++
.../phoenixdb/__init__.py | 0
.../phoenixdb/avatica/__init__.py | 0
.../phoenixdb/avatica/client.py| 11 +-
.../phoenixdb/avatica/proto}/__init__.py | 1 -
.../phoenixdb/avatica/proto/common_pb2.py | 14 ++
.../phoenixdb/avatica/proto/requests_pb2.py| 14 ++
.../phoenixdb/avatica/proto/responses_pb2.py | 14 ++
.../phoenixdb/connection.py| 0
.../phoenixdb/cursor.py| 0
.../phoenixdb/errors.py| 0
.../phoenixdb/sqlalchemy_phoenix.py| 0
.../phoenixdb/tests/__init__.py| 0
.../phoenixdb/tests/dbapi20.py | 0
.../phoenixdb/tests/test_avatica.py| 0
.../phoenixdb/tests/test_db.py | 0
.../phoenixdb/tests/test_dbapi20.py| 0
.../phoenixdb/tests/test_errors.py | 0
.../phoenixdb/tests/test_sqlalchemy.py | 0
.../phoenixdb/tests/test_types.py | 0
.../phoenixdb/types.py | 0
.../requirements.txt | 0
{python/phoenixdb => python-phoenixdb}/setup.cfg | 0
{python/phoenixdb => python-phoenixdb}/setup.py| 0
{python/phoenixdb => python-phoenixdb}/tox.ini | 0
python/.gitignore | 8 -
python/README.md | 68 ---
python/phoenixdb/Dockerfile| 9 -
python/phoenixdb/Dockerfile-pqs| 9 -
python/phoenixdb/ci/build-env/Dockerfile | 7 -
python/phoenixdb/ci/phoenix/docker-entrypoint.sh | 24 ---
python/phoenixdb/ci/phoenix/hbase-site.xml | 12 --
python/phoenixdb/doc/api.rst | 30 ---
python/phoenixdb/doc/index.rst | 27 ---
python/phoenixdb/doc/versions.rst | 3 -
.../phoenixdb/phoenixdb/avatica/proto/__init__.py | 0
61 files changed, 768 insertions(+), 256 deletions(-)
diff --git a/phoenix-queryserver-it/src/it/bin/test_phoenixdb.sh
b/phoenix-queryserver-it/src/it/bin/test_phoenixdb.sh
index ff4893e..6d914e4 100755
--- a/phoenix-queryserver-it/src/it/bin/test_phoenixdb.sh
+++ b/phoenix-queryse
[phoenix] branch master updated: Revert "PHOENIX-5922 - IndexUpgradeTool should always re-enable tables on failure"
This is an automated email from the ASF dual-hosted git repository.
elserj 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 18b219d Revert "PHOENIX-5922 - IndexUpgradeTool should always
re-enable tables on failure"
18b219d is described below
commit 18b219d7d270d546d7be29164229161531bd9330
Author: Josh Elser
AuthorDate: Thu May 28 19:18:34 2020 -0400
Revert "PHOENIX-5922 - IndexUpgradeTool should always re-enable tables on
failure"
This reverts commit 45929b5a74feddb647571c7d7c057142973b45b0.
---
.../end2end/ParameterizedIndexUpgradeToolIT.java | 46 -
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 107 ++---
2 files changed, 31 insertions(+), 122 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java
index 2ed249e..5479576 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java
@@ -381,52 +381,6 @@ public class ParameterizedIndexUpgradeToolIT extends
BaseTest {
}
}
-@Test
-public void testRollbackAfterFailure() throws Exception {
-validate(true);
-if (upgrade) {
-iut.setFailUpgradeTask(true);
-} else {
-iut.setFailDowngradeTask(true);
-}
-iut.prepareToolSetup();
-int status = iut.executeTool();
-Assert.assertEquals(-1, status);
-//should have rolled back and be in the same status we started with
-validate(true);
-}
-
-@Test
-public void testTableReenableAfterDoubleFailure() throws Exception {
-validate(true);
-//this will force the upgrade/downgrade to fail, and then the rollback
to fail too
-//we want to make sure that even then, we'll try to re-enable the
HBase tables
-iut.setFailUpgradeTask(true);
-iut.setFailDowngradeTask(true);
-iut.prepareToolSetup();
-try {
-iut.executeTool();
-} catch (RuntimeException e) {
-//double failures throw an exception so that the tool stops
immediately
-validateTablesEnabled(INPUT_LIST);
-return;
-}
-Assert.fail("Should have thrown an exception!");
-}
-
-private void validateTablesEnabled(String inputList) throws IOException,
SQLException {
-Admin admin =
conn.unwrap(PhoenixConnection.class).getQueryServices().getAdmin();
-String[] tableNames = inputList.split(",");
-Assert.assertNotNull(tableNames);
-Assert.assertTrue(tableNames.length > 0);
-for (String tableName : tableNames) {
-String physicalTableName =
-
SchemaUtil.getPhysicalHBaseTableName(SchemaUtil.getSchemaNameFromFullName(tableName),
-SchemaUtil.getTableNameFromFullName(tableName),
isNamespaceEnabled).getString();
-
Assert.assertTrue(admin.isTableEnabled(TableName.valueOf(physicalTableName)));
-}
-}
-
@After
public void cleanup() throws IOException, SQLException {
if (conn == null) {
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java
index fca7930..a856b5e 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java
@@ -26,8 +26,6 @@ import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
-import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.client.CoprocessorDescriptorBuilder;
@@ -62,8 +60,6 @@ import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
import java.util.logging.Logger;
import org.apache.hadoop.conf.Configuration;
import org.apache.phoenix.util.SchemaUtil;
@@ -135,10 +131,6 @@ public class IndexUpgradeTool extends Configured
implements Tool {
private String indexToolOpts;
private boolean test = false;
-private boolean isWaitComplete = false;
-private boolean failUpgradeTask = false;
-private boolean failDowngradeTask = false;
-private boolean hasFailure = false;
public void setDryRun(boolean dryRun) {
this.dryRun
[phoenix-queryserver] branch master updated: PHOENIX-5827 Add a maven repo to PQS and optionally bundle phoenix-client
This is an automated email from the ASF dual-hosted git repository.
elserj 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 ea5c806 PHOENIX-5827 Add a maven repo to PQS and optionally bundle
phoenix-client
ea5c806 is described below
commit ea5c80615241e6773c39213ed84d1673ca5ea866
Author: Josh Elser
AuthorDate: Wed Apr 8 15:35:06 2020 -0400
PHOENIX-5827 Add a maven repo to PQS and optionally bundle phoenix-client
* Move the cluster.xml to the prescribed location per Maven convention.
* Use maven-assembly-plugin to create a Maven repo in the assembly
* Pull the phoenix-client jar from central and localize so PQS can actually
function
* Fix the phoenix-client jar name so that it's picked up by phoenix_utils.py
* Prevent old Jetty versions from sneaking in on HBase 1.x
* Build the ServerCustomizer and expose configuration to enable it
Move integration tests to a dedicated module to avoid jetty clashing
With Hadoop2/HBase1, we have to deal with conflicting versions of Jetty
at runtime. Avatica's ServerCustomizers expose an unshaded Jetty class
(Server), which causes problems when we have Jetty6 also on the
classpath.
We can avoid this by moving all things that touch Avatica's version of
Jetty into queryserver, shade that, and then only invoke HBase/Hadoop
from within a different module (letting their Jetty6 run wild).
The only gripe is that BasicAuthenticationServerCustomizer has to live
in src/main/java to get shaded, even though it is test-only code. This
is a minor grievance for what's a horrible runtime solution. This all
gets much better with Hadoop3/HBase2 where Jetty is shaded.
Closes #25
Signed-off-by: Istvan Toth
---
.github/workflows/maven.yml| 2 +-
.gitignore | 3 +-
README.md | 39 -
assembly/pom.xml | 41 -
assembly/{ => src/assembly}/cluster.xml| 39 -
load-balancer/pom.xml | 4 -
pom.xml| 60 ++--
queryserver-client/pom.xml | 3 +-
{queryserver => queryserver-it}/pom.xml| 169 -
queryserver-it/src/it/bin/test_phoenixdb.py| 39 +
queryserver-it/src/it/bin/test_phoenixdb.sh| 79 ++
.../HttpParamImpersonationQueryServerIT.java | 0
.../phoenix/end2end/QueryServerBasicsIT.java | 0
.../phoenix/end2end/QueryServerEnvironment.java| 0
.../phoenix/end2end/QueryServerTestUtil.java | 0
.../apache/phoenix/end2end/QueryServerThread.java | 0
.../phoenix/end2end/SecureQueryServerIT.java | 0
.../end2end/SecureQueryServerPhoenixDBIT.java | 2 +
.../phoenix/end2end/ServerCustomizersIT.java | 65 +---
.../java/org/apache/phoenix/end2end/TlsUtil.java | 0
.../src/it/resources/log4j.properties | 0
queryserver/pom.xml| 109 ++---
.../phoenix/queryserver/QueryServerOptions.java| 6 +-
.../phoenix/queryserver/QueryServerProperties.java | 5 +-
.../phoenix/queryserver/server/QueryServer.java| 8 +-
.../server/ServerCustomizersFactory.java | 29 +++-
.../BasicAuthenticationServerCustomizer.java | 86 +++
.../HostedClientJarsServerCustomizer.java | 73 +
.../queryserver/server/ServerCustomizersTest.java | 15 +-
.../HostedClientJarsServerCustomizerTest.java | 67
30 files changed, 597 insertions(+), 346 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 78c1bb6..c9835c7 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -13,4 +13,4 @@ jobs:
with:
java-version: 1.8
- name: Build with Maven
- run: mvn clean install
+ run: mvn -B clean install
diff --git a/.gitignore b/.gitignore
index e3c6527..5db5505 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
*.class
*.war
*.jar
+dependency-reduced-pom.xml
# python
*.pyc
@@ -26,4 +27,4 @@ target/
release/
RESULTS/
CSV_EXPORT/
-.DS_Store
\ No newline at end of file
+.DS_Store
diff --git a/README.md b/README.md
index 0c6c489..c54986f 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,41 @@ limitations under the License.
-[Apache Phoenix](http://phoenix.apache.org/) enables OLTP and
operational analytics in Hadoop for low latency applications. Visit the Apache
Phoenix website [here](http://phoenix.apache.org/). This is the repo for
the Query Server.
+[Apache Phoenix](http://phoenix.apache.org/) enable
svn commit: r37912 - in /release/phoenix: apache-phoenix-4.14.0-cdh5.11.2/ apache-phoenix-4.14.0-cdh5.12.2/ apache-phoenix-4.14.0-cdh5.13.2/ apache-phoenix-4.14.0-cdh5.14.2/ apache-phoenix-4.14.2-HBas
Author: elserj Date: Fri Feb 7 01:04:37 2020 New Revision: 37912 Log: Archiving old 4.14 releases Removed: release/phoenix/apache-phoenix-4.14.0-cdh5.11.2/ release/phoenix/apache-phoenix-4.14.0-cdh5.12.2/ release/phoenix/apache-phoenix-4.14.0-cdh5.13.2/ release/phoenix/apache-phoenix-4.14.0-cdh5.14.2/ release/phoenix/apache-phoenix-4.14.2-HBase-1.3/ release/phoenix/apache-phoenix-4.14.2-HBase-1.4/
svn commit: r1872559 - in /phoenix/site: publish/0. publish/faq.html publish/language/datatypes.html publish/language/functions.html publish/language/index.html source/src/site/markdown/faq.md
Author: elserj Date: Thu Jan 9 16:46:20 2020 New Revision: 1872559 URL: http://svn.apache.org/viewvc?rev=1872559=rev Log: Getting faq re-published Removed: phoenix/site/publish/0. Modified: phoenix/site/publish/faq.html phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/source/src/site/markdown/faq.md Modified: phoenix/site/publish/faq.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/faq.html?rev=1872559=1872558=1872559=diff == --- phoenix/site/publish/faq.html (original) +++ phoenix/site/publish/faq.html Thu Jan 9 16:46:20 2020 @@ -0,0 +1,694 @@ + + + + + + + + F.A.Q. | Apache Phoenix + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + About + + Overview + Who is Using + Recent Improvements + Roadmap + News + Performance + Team + Presentations + Mailing Lists + Source Repository + Issue Tracking + Download + Installation + + How to Contribute + How to Develop + How to Update Website + How to Release + + http://www.apache.org/licenses/; title="License" class="externalLink">License + + + + Using + + F.A.Q. + Quick Start + Building + Tuning + Explain Plan + Configuration + Backward Compatibility + Release Notes + Performance Testing + + Apache Spark Integration + Phoenix Storage Handler for Apache Hive +
[phoenix-connectors] branch master updated: PHOENIX-5662 The integration tests in phoenix-hive are broken
This is an automated email from the ASF dual-hosted git repository.
elserj 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 255538b PHOENIX-5662 The integration tests in phoenix-hive are broken
255538b is described below
commit 255538b63f7ac44f17f1f4311c8a4608ef449441
Author: Toshihiro Suzuki
AuthorDate: Tue Jan 7 18:21:49 2020 +0900
PHOENIX-5662 The integration tests in phoenix-hive are broken
Signed-off-by: Josh Elser
Closes #15
---
.../it/java/org/apache/phoenix/hive/BaseHivePhoenixStoreIT.java | 8 ++--
.../src/it/java/org/apache/phoenix/hive/HiveMapReduceIT.java | 6 --
.../src/it/java/org/apache/phoenix/hive/HivePhoenixStoreIT.java | 7 ++-
phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveTezIT.java | 4
4 files changed, 4 insertions(+), 21 deletions(-)
diff --git
a/phoenix-hive/src/it/java/org/apache/phoenix/hive/BaseHivePhoenixStoreIT.java
b/phoenix-hive/src/it/java/org/apache/phoenix/hive/BaseHivePhoenixStoreIT.java
index c705e2d..df77fcc 100644
---
a/phoenix-hive/src/it/java/org/apache/phoenix/hive/BaseHivePhoenixStoreIT.java
+++
b/phoenix-hive/src/it/java/org/apache/phoenix/hive/BaseHivePhoenixStoreIT.java
@@ -25,29 +25,26 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
+import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
import org.apache.phoenix.jdbc.PhoenixDriver;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.AfterClass;
-import org.junit.experimental.categories.Category;
import java.io.File;
import java.io.IOException;
import java.sql.*;
import java.util.Properties;
-import static org.apache.phoenix.query.BaseTest.setUpConfigForMiniCluster;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
* Base class for all Hive Phoenix integration tests that may be run with Tez
or MR mini cluster
*/
-@Category(NeedsOwnMiniClusterTest.class)
-public class BaseHivePhoenixStoreIT {
+public class BaseHivePhoenixStoreIT extends BaseHBaseManagedTimeIT {
private static final Log LOG =
LogFactory.getLog(BaseHivePhoenixStoreIT.class);
protected static HBaseTestingUtility hbaseTestUtil;
@@ -59,7 +56,6 @@ public class BaseHivePhoenixStoreIT {
protected static String hiveOutputDir;
protected static String hiveLogDir;
-
public static void setup(HiveTestUtil.MiniClusterType clusterType)throws
Exception {
String hadoopConfDir = System.getenv("HADOOP_CONF_DIR");
if (null != hadoopConfDir && !hadoopConfDir.isEmpty()) {
diff --git
a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveMapReduceIT.java
b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveMapReduceIT.java
index 4bc5a7d..a60f24c 100644
--- a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveMapReduceIT.java
+++ b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HiveMapReduceIT.java
@@ -20,14 +20,8 @@ package org.apache.phoenix.hive;
import static org.junit.Assert.fail;
-import java.util.Map;
-
-import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-import org.junit.Ignore;
-@Category(NeedsOwnMiniClusterTest.class)
public class HiveMapReduceIT extends HivePhoenixStoreIT {
@BeforeClass
diff --git
a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HivePhoenixStoreIT.java
b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HivePhoenixStoreIT.java
index 66f99ad..6ce409b 100644
--- a/phoenix-hive/src/it/java/org/apache/phoenix/hive/HivePhoenixStoreIT.java
+++ b/phoenix-hive/src/it/java/org/apache/phoenix/hive/HivePhoenixStoreIT.java
@@ -18,11 +18,9 @@
package org.apache.phoenix.hive;
import org.apache.hadoop.fs.Path;
-import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.util.StringUtil;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -32,10 +30,8 @@ import static org.junit.Assert.assertTrue;
/**
* Test methods only. All supporting methods should be placed to
BaseHivePhoenixStoreIT
*/
-
-@Category(NeedsOwnMiniClusterTest.class)
@Ignore("This class contains only test methods and should not be executed
directly")
-public class HivePhoenixStoreIT extends BaseHivePhoenixStoreIT {
+public class HivePhoenixStoreIT extends BaseHivePhoenixStoreIT {
/**
* Create a table with two column, insert 1 r
svn commit: r1871355 - in /phoenix/site: publish/index.html publish/language/datatypes.html publish/language/functions.html publish/language/index.html publish/team.html source/src/site/markdown/index
Author: elserj Date: Sat Dec 14 00:12:29 2019 New Revision: 1871355 URL: http://svn.apache.org/viewvc?rev=1871355=rev Log: Remove the search-hadoop.com link as it seems like it changed owners We can re-instate it after we make sure that it isn't owned by some entity which will try to take advantage of our outbound link to it. Modified: phoenix/site/publish/index.html phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/team.html phoenix/site/source/src/site/markdown/index.md Modified: phoenix/site/publish/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/index.html?rev=1871355=1871354=1871355=diff == --- phoenix/site/publish/index.html (original) +++ phoenix/site/publish/index.html Sat Dec 14 00:12:29 2019 @@ -1,7 +1,7 @@ @@ -177,29 +177,30 @@ -Download latest Apache Phoenix binary and source release artifacts -Browse through Apache Phoenix JIRAs -Sync and build Apache Phoenix from source code - - http://search-hadoop.com/?; method="get"> - - - - - - - - - - - http://search-hadoop.com/?; method="get"> - - - - +Download latest Apache Phoenix binary and source release artifacts +Browse through Apache Phoenix JIRAs +Sync and build Apache Phoenix from source code + + News: Phoenix next major release 5.0.0 has been released and is available for download here https://twitter.com/ApachePhoenix;> Modified: phoenix/site/publish/language/datatypes.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1871355=1871354=1871355=diff == --- phoenix/site/publish/language/datatypes.html (original) +++ phoenix/site/publish/language/datatypes.html Sat Dec 14 00:12:29 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/language/functions.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1871355=1871354=1871355=diff == --- phoenix/site/publish/language/functions.html (original) +++ phoenix/site/publish/language/functions.html Sat Dec 14 00:12:29 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1871355=1871354=1871355=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Sat Dec 14 00:12:29 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/team.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/team.html?rev=1871355=1871354=1871355=diff == --- phoenix/site/publish/team.html (original) +++ phoenix/site/publish/team.html Sat Dec 14 00:12:29 2019 @@ -1,7 +1,7 @@ @@ -403,42 +403,48 @@ Committer + Istvan Toth + Cloudera + mailto:st...@apache.org;>st...@apache.org + Committer + + Jaanai Zhang Alibaba mailto:jaa...@apache.org;>jaa...@apache.org Committer - + Jan Fernando Salesforce mailto:jferna...@apache.org;>jferna...@apache.org Committer - + Kadir Ozdemir Salesforce mailto:ka...@apache.org;>ka...@apache.org Committer - + Kevin Liew Simba Technologies mailto:kl...@apache.org;>kl...@apache.org Committer - + Mihir Monani Salesforce mailto:mihir6...@apache.org;>mihir6...@apache.org Committer - + Swaroopa Kadam Salesforce mailto:ska...@apache.org;>ska...@apache.org Committer - + Ohad Shacham Yahoo Research, Oath mailto:oh...@apache.org;>oh...@apache.org Modified: phoenix/site/source/src/site/markdown/index.md URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/index.md?rev=1871355=1871354=1871355=diff == --- phoenix/site/source/src/site/markdown/index.md (original) +++ phoenix/site/source/src/site/markdown/index.md Sat Dec 14 00:12:29 2019 @@ -9,28 +9,28 @@ - + Download latest Apache Phoenix binary and source release artifacts - + Browse through Apache Phoenix JIRAs - + Sync and build Apache Phoenix from source code - + - +
svn commit: r1870118 [1/2] - in /phoenix/site: publish/ publish/language/ source/src/site/ source/src/site/markdown/
Author: elserj Date: Thu Nov 21 19:53:57 2019 New Revision: 1870118 URL: http://svn.apache.org/viewvc?rev=1870118=rev Log: Add some placeholders for Omid and Tephra becoming sub-projects Added: phoenix/site/publish/omid.html phoenix/site/publish/tephra.html phoenix/site/source/src/site/markdown/omid.md phoenix/site/source/src/site/markdown/tephra.md 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/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/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/site.xml 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=1870118=1870117=1870118=diff == --- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original) +++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Thu Nov 21 19:53:57 2019 @@ -1,7 +1,7 @@ @@ -101,6 +101,8 @@ http://python-phoenixdb.readthedocs.io/en/latest; title="Phoenix Adapter for Python" class="externalLink">Phoenix Adapter for Python Phoenix ORM Library https://prestosql.io/docs/current/connector/phoenix.html; title="Phoenix Connector for Presto" class="externalLink">Phoenix Connector for Presto + Apache Phoenix Omid Transaction Manager + Apache Phoenix Tephra Transaction Manager Modified: phoenix/site/publish/array_type.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/array_type.html?rev=1870118=1870117=1870118=diff == --- phoenix/site/publish/array_type.html (original) +++ phoenix/site/publish/array_type.html Thu Nov 21 19:53:57 2019 @@ -1,7 +1,7 @@ @@ -101,6 +101,8 @@ http://python-phoenixdb.re
svn commit: r1870118 [2/2] - in /phoenix/site: publish/ publish/language/ source/src/site/ source/src/site/markdown/
Modified: phoenix/site/publish/secondary_indexing.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/secondary_indexing.html?rev=1870118=1870117=1870118=diff == --- phoenix/site/publish/secondary_indexing.html (original) +++ phoenix/site/publish/secondary_indexing.html Thu Nov 21 19:53:57 2019 @@ -1,7 +1,7 @@ @@ -101,6 +101,8 @@ http://python-phoenixdb.readthedocs.io/en/latest; title="Phoenix Adapter for Python" class="externalLink">Phoenix Adapter for Python Phoenix ORM Library https://prestosql.io/docs/current/connector/phoenix.html; title="Phoenix Connector for Presto" class="externalLink">Phoenix Connector for Presto + Apache Phoenix Omid Transaction Manager + Apache Phoenix Tephra Transaction Manager Modified: phoenix/site/publish/sequences.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/sequences.html?rev=1870118=1870117=1870118=diff == --- phoenix/site/publish/sequences.html (original) +++ phoenix/site/publish/sequences.html Thu Nov 21 19:53:57 2019 @@ -1,7 +1,7 @@ @@ -101,6 +101,8 @@ http://python-phoenixdb.readthedocs.io/en/latest; title="Phoenix Adapter for Python" class="externalLink">Phoenix Adapter for Python Phoenix ORM Library https://prestosql.io/docs/current/connector/phoenix.html; title="Phoenix Connector for Presto" class="externalLink">Phoenix Connector for Presto + Apache Phoenix Omid Transaction Manager + Apache Phoenix Tephra Transaction Manager Modified: phoenix/site/publish/server.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/server.html?rev=1870118=1870117=1870118=diff == --- phoenix/site/publish/server.html (original) +++ phoenix/site/publish/server.html Thu Nov 21 19:53:57 2019 @@ -1,7 +1,7 @@ @@ -101,6 +101,8 @@ http://python-phoenixdb.readthedocs.io/en/latest; title="Phoenix Adapter for Python" class="externalLink">Phoenix Adapter for Python Phoenix ORM Library https://prestosql.io/docs/current/connector/phoenix.html; title="Phoenix Connector for Presto" class="externalLink">Phoenix Connector for Presto + Apache Phoenix Omid Transaction Manager + Apache Phoenix Tephra Transaction Manager Modified: phoenix/site/publish/skip_scan.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/skip_scan.html?rev=1870118=1870117=1870118=diff == --- phoenix/site/publish/skip_scan.html (original) +++ phoenix/site/publish/skip_scan.html Thu Nov 21 19:53:57 2019 @@ -1,7 +1,7 @@ @@ -101,6 +101,8 @@ http://python-phoenixdb.readthedocs.io/en/latest; title="Phoenix Adapter for Python" class="externalLink">Phoenix Adapter for Python Phoenix ORM Library https://prestosql.io/docs/current/connector/phoenix.html; title="Phoenix Connector for Presto" class="externalLink">Phoenix Connector for Presto + Apache Phoenix Omid Transaction Manager +
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5551 Update maven apache parent to version 21
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch 4.x-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push:
new fa163b0 PHOENIX-5551 Update maven apache parent to version 21
fa163b0 is described below
commit fa163b019ae74a268c500030f1a1e101f0a2e92b
Author: Istvan Toth
AuthorDate: Tue Oct 29 15:56:19 2019 +0100
PHOENIX-5551 Update maven apache parent to version 21
also remove explicit version settings for the managed plugins
Closes #613
---
phoenix-core/pom.xml | 1 -
pom.xml | 20 +---
2 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 109652c..3c6b2c8 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -160,7 +160,6 @@
org.apache.maven.plugins
maven-dependency-plugin
-${maven-dependency-plugin.version}
diff --git a/pom.xml b/pom.xml
index 1e09a69..6dd57b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
org.apache
apache
-14
+21
@@ -124,11 +124,6 @@
2.9
1.9.1
-2.22.2
-2.22.2
-
-2.1
-2.5.2
8
@@ -149,7 +144,6 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.0
1.7
1.7
@@ -184,7 +178,6 @@
org.apache.maven.plugins
maven-install-plugin
- 2.5.2
org.apache.maven.plugins
@@ -193,7 +186,6 @@
maven-assembly-plugin
- ${maven.assembly.version}
org.apache.rat
@@ -242,7 +234,6 @@
org.apache.maven.plugins
maven-failsafe-plugin
- ${maven-failsafe-plugin.version}
ParallelStatsEnabledTest
@@ -352,7 +343,6 @@
maven-dependency-plugin
- ${maven-dependency-plugin.version}
create-mrapp-generated-classpath
@@ -370,7 +360,6 @@
org.apache.maven.plugins
maven-shade-plugin
- 2.4.3
@@ -408,7 +397,6 @@
org.apache.maven.plugins
maven-source-plugin
-2.2.1
attach-sources
@@ -422,7 +410,6 @@
org.apache.maven.plugins
maven-javadoc-plugin
-2.9
true
@@ -445,7 +432,6 @@
org.apache.maven.plugins
maven-surefire-plugin
-${maven-surefire-plugin.version}
${numForkedUT}
true
@@ -459,7 +445,6 @@
org.apache.maven.plugins
maven-jar-plugin
-2.4
prepare-package
@@ -473,7 +458,6 @@
org.apache.maven.plugins
maven-site-plugin
-3.7.1
org.apache.rat
@@ -1057,7 +1041,6 @@
org.apache.maven.plugins
maven-gpg-plugin
-1.6
sign-artifacts
@@ -1086,7 +1069,6 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.0.0
org.codehaus.mojo
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5551 Update maven apache parent to version 21
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch 4.x-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push:
new 35fe81c PHOENIX-5551 Update maven apache parent to version 21
35fe81c is described below
commit 35fe81cad6192d367c1065858b3592ae671cefa6
Author: Istvan Toth
AuthorDate: Tue Oct 29 15:56:19 2019 +0100
PHOENIX-5551 Update maven apache parent to version 21
also remove explicit version settings for the managed plugins
Closes #613
---
phoenix-core/pom.xml | 1 -
pom.xml | 20 +---
2 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 497e28a..0663528 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -160,7 +160,6 @@
org.apache.maven.plugins
maven-dependency-plugin
-${maven-dependency-plugin.version}
diff --git a/pom.xml b/pom.xml
index f0518af..a371f04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
org.apache
apache
-14
+21
@@ -124,11 +124,6 @@
2.9
1.9.1
-2.22.2
-2.22.2
-
-2.1
-2.5.2
8
@@ -149,7 +144,6 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.0
1.7
1.7
@@ -184,7 +178,6 @@
org.apache.maven.plugins
maven-install-plugin
- 2.5.2
org.apache.maven.plugins
@@ -193,7 +186,6 @@
maven-assembly-plugin
- ${maven.assembly.version}
org.apache.rat
@@ -242,7 +234,6 @@
org.apache.maven.plugins
maven-failsafe-plugin
- ${maven-failsafe-plugin.version}
ParallelStatsEnabledTest
@@ -352,7 +343,6 @@
maven-dependency-plugin
- ${maven-dependency-plugin.version}
create-mrapp-generated-classpath
@@ -370,7 +360,6 @@
org.apache.maven.plugins
maven-shade-plugin
- 2.4.3
@@ -408,7 +397,6 @@
org.apache.maven.plugins
maven-source-plugin
-2.2.1
attach-sources
@@ -422,7 +410,6 @@
org.apache.maven.plugins
maven-javadoc-plugin
-2.9
true
@@ -445,7 +432,6 @@
org.apache.maven.plugins
maven-surefire-plugin
-${maven-surefire-plugin.version}
${numForkedUT}
true
@@ -459,7 +445,6 @@
org.apache.maven.plugins
maven-jar-plugin
-2.4
prepare-package
@@ -473,7 +458,6 @@
org.apache.maven.plugins
maven-site-plugin
-3.7.1
org.apache.rat
@@ -1067,7 +1051,6 @@
org.apache.maven.plugins
maven-gpg-plugin
-1.6
sign-artifacts
@@ -1096,7 +1079,6 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.0.0
org.codehaus.mojo
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5551 Update maven apache parent to version 21
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch 4.x-HBase-1.5
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.5 by this push:
new 16da0f3 PHOENIX-5551 Update maven apache parent to version 21
16da0f3 is described below
commit 16da0f33619ffdabc33a6368923ce3c98618fdcf
Author: Istvan Toth
AuthorDate: Tue Oct 29 15:56:19 2019 +0100
PHOENIX-5551 Update maven apache parent to version 21
also remove explicit version settings for the managed plugins
Closes #613
---
phoenix-core/pom.xml | 1 -
pom.xml | 20 +---
2 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index ec19d84..69a52c3 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -160,7 +160,6 @@
org.apache.maven.plugins
maven-dependency-plugin
-${maven-dependency-plugin.version}
diff --git a/pom.xml b/pom.xml
index 7cbc656..afd5a2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
org.apache
apache
-14
+21
@@ -128,11 +128,6 @@
2.9
1.9.1
-2.22.2
-2.22.2
-
-2.1
-2.5.2
8
@@ -153,7 +148,6 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.0
1.7
1.7
@@ -188,7 +182,6 @@
org.apache.maven.plugins
maven-install-plugin
- 2.5.2
org.apache.maven.plugins
@@ -197,7 +190,6 @@
maven-assembly-plugin
- ${maven.assembly.version}
org.apache.rat
@@ -246,7 +238,6 @@
org.apache.maven.plugins
maven-failsafe-plugin
- ${maven-failsafe-plugin.version}
ParallelStatsEnabledTest
@@ -356,7 +347,6 @@
maven-dependency-plugin
- ${maven-dependency-plugin.version}
create-mrapp-generated-classpath
@@ -374,7 +364,6 @@
org.apache.maven.plugins
maven-shade-plugin
- 2.4.3
@@ -412,7 +401,6 @@
org.apache.maven.plugins
maven-source-plugin
-2.2.1
attach-sources
@@ -426,7 +414,6 @@
org.apache.maven.plugins
maven-javadoc-plugin
-2.9
true
@@ -449,7 +436,6 @@
org.apache.maven.plugins
maven-surefire-plugin
-${maven-surefire-plugin.version}
${numForkedUT}
true
@@ -463,7 +449,6 @@
org.apache.maven.plugins
maven-jar-plugin
-2.4
prepare-package
@@ -477,7 +462,6 @@
org.apache.maven.plugins
maven-site-plugin
-3.7.1
org.apache.rat
@@ -1071,7 +1055,6 @@
org.apache.maven.plugins
maven-gpg-plugin
-1.6
sign-artifacts
@@ -1100,7 +1083,6 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.0.0
org.codehaus.mojo
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5575 Remove redundant dependency versions
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch 4.x-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push:
new 5186f4e PHOENIX-5575 Remove redundant dependency versions
5186f4e is described below
commit 5186f4ea4f50a3c7057d1824671582cb0487a331
Author: Istvan Toth
AuthorDate: Fri Nov 15 14:56:22 2019 -0800
PHOENIX-5575 Remove redundant dependency versions
remove the explicit version elements that have no effect
Closes #636
---
phoenix-core/pom.xml | 9 -
1 file changed, 9 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 0629fe9..497e28a 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -206,7 +206,6 @@
org.apache.omid
omid-hbase-coprocessor-hbase1.x
-${omid.version}
org.testng
@@ -217,7 +216,6 @@
org.apache.omid
omid-tso-server-hbase1.x
-${omid.version}
org.apache.curator
@@ -240,7 +238,6 @@
org.apache.omid
omid-tso-server-hbase1.x
-${omid.version}
test-jar
@@ -345,22 +342,18 @@
com.google.protobuf
protobuf-java
- ${protobuf-java.version}
log4j
log4j
- ${log4j.version}
org.slf4j
slf4j-api
- ${slf4j.version}
org.iq80.snappy
snappy
- ${snappy.version}
com.github.stephenc.high-scale-lib
@@ -505,12 +498,10 @@
com.clearspring.analytics
stream
- ${stream.version}
com.salesforce.i18n
i18n-util
- ${i18n-util.version}
com.lmax
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5575 Remove redundant dependency versions
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch 4.x-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push:
new a0f6312 PHOENIX-5575 Remove redundant dependency versions
a0f6312 is described below
commit a0f631240034772e10739a568a332eeca1848925
Author: Istvan Toth
AuthorDate: Fri Nov 15 14:56:22 2019 -0800
PHOENIX-5575 Remove redundant dependency versions
remove the explicit version elements that have no effect
Closes #636
---
phoenix-core/pom.xml | 9 -
1 file changed, 9 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index ffc02ec..109652c 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -206,7 +206,6 @@
org.apache.omid
omid-hbase-coprocessor-hbase1.x
-${omid.version}
org.testng
@@ -217,7 +216,6 @@
org.apache.omid
omid-tso-server-hbase1.x
-${omid.version}
org.apache.curator
@@ -240,7 +238,6 @@
org.apache.omid
omid-tso-server-hbase1.x
-${omid.version}
test-jar
@@ -345,22 +342,18 @@
com.google.protobuf
protobuf-java
- ${protobuf-java.version}
log4j
log4j
- ${log4j.version}
org.slf4j
slf4j-api
- ${slf4j.version}
org.iq80.snappy
snappy
- ${snappy.version}
com.github.stephenc.high-scale-lib
@@ -497,12 +490,10 @@
com.clearspring.analytics
stream
- ${stream.version}
com.salesforce.i18n
i18n-util
- ${i18n-util.version}
com.lmax
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5575 Remove redundant dependency versions
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch 4.x-HBase-1.5
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.5 by this push:
new 90303e7 PHOENIX-5575 Remove redundant dependency versions
90303e7 is described below
commit 90303e7044c39805a441003767988dde208e0753
Author: Istvan Toth
AuthorDate: Fri Nov 15 14:56:22 2019 -0800
PHOENIX-5575 Remove redundant dependency versions
remove the explicit version elements that have no effect
Closes #636
---
phoenix-core/pom.xml | 9 -
1 file changed, 9 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 8734f74..ec19d84 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -206,7 +206,6 @@
org.apache.omid
omid-hbase-coprocessor-hbase1.x
-${omid.version}
org.testng
@@ -217,7 +216,6 @@
org.apache.omid
omid-tso-server-hbase1.x
-${omid.version}
org.apache.curator
@@ -240,7 +238,6 @@
org.apache.omid
omid-tso-server-hbase1.x
-${omid.version}
test-jar
@@ -345,22 +342,18 @@
com.google.protobuf
protobuf-java
- ${protobuf-java.version}
log4j
log4j
- ${log4j.version}
org.slf4j
slf4j-api
- ${slf4j.version}
org.iq80.snappy
snappy
- ${snappy.version}
com.github.stephenc.high-scale-lib
@@ -505,12 +498,10 @@
com.clearspring.analytics
stream
- ${stream.version}
com.salesforce.i18n
i18n-util
- ${i18n-util.version}
com.lmax
[phoenix] 03/03: PHOENIX-5572 httpclient NoClassDefFoundError due to old httpcore version
This is an automated email from the ASF dual-hosted git repository. elserj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git commit 8f4cbf028585d3e017143e579d07369be384ff7d Author: Istvan Toth AuthorDate: Fri Nov 15 12:35:07 2019 -0800 PHOENIX-5572 httpclient NoClassDefFoundError due to old httpcore version exclude httpcore from the tephra dependency, so that we get httpcore via hadoop3->httpclient Closes #634 --- pom.xml | 4 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index d83c14b..1dd4c19 100644 --- a/pom.xml +++ b/pom.xml @@ -787,6 +787,10 @@ ch.qos.logback logback-classic + +org.apache.httpcomponents +httpcore +
[phoenix] branch master updated (234660e -> 8f4cbf0)
This is an automated email from the ASF dual-hosted git repository. elserj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git. from 234660e PHOENIX-5565 Unify index update structures in IndexRegionObserver and IndexCommitter new 1ce821c PHOENIX-5575 Remove redundant dependency versions new 0f6fafe PHOENIX-5551 Update maven apache parent to version 21 new 8f4cbf0 PHOENIX-5572 httpclient NoClassDefFoundError due to old httpcore version The 3 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. Summary of changes: phoenix-core/pom.xml | 11 --- pom.xml | 24 +--- 2 files changed, 5 insertions(+), 30 deletions(-)
[phoenix] 02/03: PHOENIX-5551 Update maven apache parent to version 21
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 0f6fafeb011251f9db9cac990298879271cd3f81
Author: Istvan Toth
AuthorDate: Tue Oct 29 15:56:19 2019 +0100
PHOENIX-5551 Update maven apache parent to version 21
also remove explicit version settings for the managed plugins
Closes #613
---
phoenix-core/pom.xml | 1 -
pom.xml | 20 +---
2 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 4b49c9b..69dd5d6 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -160,7 +160,6 @@
org.apache.maven.plugins
maven-dependency-plugin
-${maven-dependency-plugin.version}
diff --git a/pom.xml b/pom.xml
index a4e40d6..d83c14b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
org.apache
apache
-14
+21
@@ -123,11 +123,6 @@
2.9
1.9.1
-2.22.2
-2.22.2
-
-2.1
-2.5.2
8
@@ -148,7 +143,6 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.0
1.8
1.8
@@ -183,7 +177,6 @@
org.apache.maven.plugins
maven-install-plugin
- 2.5.2
org.apache.maven.plugins
@@ -192,7 +185,6 @@
maven-assembly-plugin
- ${maven.assembly.version}
org.apache.rat
@@ -241,7 +233,6 @@
org.apache.maven.plugins
maven-failsafe-plugin
- ${maven-failsafe-plugin.version}
ParallelStatsEnabledTest
@@ -351,7 +342,6 @@
maven-dependency-plugin
- ${maven-dependency-plugin.version}
create-mrapp-generated-classpath
@@ -369,7 +359,6 @@
org.apache.maven.plugins
maven-shade-plugin
- 3.1.1
@@ -407,7 +396,6 @@
org.apache.maven.plugins
maven-source-plugin
-2.2.1
attach-sources
@@ -421,7 +409,6 @@
org.apache.maven.plugins
maven-javadoc-plugin
-2.9
true
@@ -441,7 +428,6 @@
org.apache.maven.plugins
maven-surefire-plugin
-${maven-surefire-plugin.version}
${numForkedUT}
true
@@ -455,7 +441,6 @@
org.apache.maven.plugins
maven-jar-plugin
-2.4
prepare-package
@@ -469,7 +454,6 @@
org.apache.maven.plugins
maven-site-plugin
-3.7.1
org.apache.rat
@@ -1090,7 +1074,6 @@
org.apache.maven.plugins
maven-gpg-plugin
-1.6
sign-artifacts
@@ -1119,7 +1102,6 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.0.0
org.codehaus.mojo
[phoenix] 01/03: PHOENIX-5575 Remove redundant dependency versions
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 1ce821c8739028c5ceacb1f44d391700778c7ccd
Author: Istvan Toth
AuthorDate: Fri Nov 15 14:56:22 2019 -0800
PHOENIX-5575 Remove redundant dependency versions
remove the explicit version elements that have no effect
Closes #636
---
phoenix-core/pom.xml | 10 --
1 file changed, 10 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 12deece..4b49c9b 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -191,7 +191,6 @@
org.apache.omid
omid-hbase-client-hbase2.x
-${omid.version}
org.apache.curator
@@ -228,7 +227,6 @@
org.apache.omid
omid-hbase-coprocessor-hbase2.x
-${omid.version}
@@ -263,7 +261,6 @@
org.apache.omid
omid-tso-server-hbase2.x
-${omid.version}
@@ -339,7 +336,6 @@
org.apache.omid
omid-tso-server-hbase2.x
-${omid.version}
test-jar
@@ -457,22 +453,18 @@
com.google.protobuf
protobuf-java
- ${protobuf-java.version}
log4j
log4j
- ${log4j.version}
org.slf4j
slf4j-api
- ${slf4j.version}
org.iq80.snappy
snappy
- ${snappy.version}
com.github.stephenc.high-scale-lib
@@ -646,12 +638,10 @@
com.clearspring.analytics
stream
- ${stream.version}
com.salesforce.i18n
i18n-util
- ${i18n-util.version}
com.lmax
[phoenix] branch master updated: PHOENIX-5548 Upgrade Jetty to 9.3.27.v20190418
This is an automated email from the ASF dual-hosted git repository. elserj 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 59311b1 PHOENIX-5548 Upgrade Jetty to 9.3.27.v20190418 59311b1 is described below commit 59311b176fb1d258620cda1d58c656043496b015 Author: Istvan Toth AuthorDate: Mon Oct 28 11:15:02 2019 +0100 PHOENIX-5548 Upgrade Jetty to 9.3.27.v20190418 Signed-off-by: Josh Elser --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 511e32d..a4e40d6 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 1.6 2.1.2 1.12.0 -9.3.19.v20170502 +9.3.27.v20190418 0.15.0-incubating 1.0.1 2.4.0
svn commit: r1868598 - in /phoenix/site: publish/language/datatypes.html publish/language/functions.html publish/language/index.html publish/secondary_indexing.html source/src/site/markdown/secondary_
Author: elserj Date: Fri Oct 18 15:06:28 2019 New Revision: 1868598 URL: http://svn.apache.org/viewvc?rev=1868598=rev Log: PHOENIX-5511 Update secondary indexing configurations by version (Istvan Toth) Modified: phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/secondary_indexing.html phoenix/site/source/src/site/markdown/secondary_indexing.md Modified: phoenix/site/publish/language/datatypes.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1868598=1868597=1868598=diff == --- phoenix/site/publish/language/datatypes.html (original) +++ phoenix/site/publish/language/datatypes.html Fri Oct 18 15:06:28 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/language/functions.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1868598=1868597=1868598=diff == --- phoenix/site/publish/language/functions.html (original) +++ phoenix/site/publish/language/functions.html Fri Oct 18 15:06:28 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1868598=1868597=1868598=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Fri Oct 18 15:06:28 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/secondary_indexing.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/secondary_indexing.html?rev=1868598=1868597=1868598=diff == --- phoenix/site/publish/secondary_indexing.html (original) +++ phoenix/site/publish/secondary_indexing.html Fri Oct 18 15:06:28 2019 @@ -1,7 +1,7 @@ @@ -350,17 +350,25 @@ CREATE LOCAL INDEX my_index ON my_table Setup Non transactional, mutable indexing requires special configuration options on the region server and master to run - Phoenix ensures that they are setup correctly when you enable mutable indexing on the table; if the correct properties are not set, you will not be able to use secondary indexing. After adding these settings to your hbase-site.xml, youâll need to do a rolling restart of your cluster. - You will need to add the following parameters to hbase-site.xml on each region server: - - property + As Phoenix matures, it needs less and less manual configuration. For older Phoenix versions youâll need to add the properties listed for that version, as well as the properties listed for the later versions. + + + For Phoenix 4.12 and later + You will need to add the following parameters to hbase-site.xml on each region server: + +property namehbase.regionserver.wal.codec/name valueorg.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec/value /property - - The above property enables custom WAL edits to be written, ensuring proper writing/replay of the index updates. This codec supports the usual host of WALEdit options, most notably WALEdit compression. - - property + + The above property enables custom WAL edits to be written, ensuring proper writing/replay of the index updates. This codec supports the usual host of WALEdit options, most notably WALEdit compression. + + + For Phoenix 4.8 - 4.11 + The following configuration changes are also required to the server-side hbase-site.xml on the master and regions server nodes: + +property namehbase.region.server.rpc.scheduler.factory.class/name valueorg.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory/value descriptionFactory to create the Phoenix RPC Scheduler that uses separate queues for index and metadata updates/description @@ -371,11 +379,14 @@ CREATE LOCAL INDEX my_index ON my_table descriptionFactory to create the Phoenix RPC Scheduler that uses separate queues for index and metadata updates/description /property - - The above properties prevent deadlocks from occurring during index maintenance for global indexes (HBase 0.98.4+ and Phoenix 4.3.1+ only) by ensuring index updates are processed with a higher priority than data updates. It also prevents deadlocks by ensuring metadata rpc calls are processed with a higher priority than data rpc calls. - From Phoenix 4.8.0 onward, no configuration changes are required to use local indexing. In Phoenix 4.7 and below, the following configuration changes are required to the server-side hbase-site.xml on the master and regions server nodes: - - property + + The above properties prevent deadlocks from occurring during index maintenance for global indexes (HBase 0.98.4
[phoenix-queryserver] branch master updated: PHOENIX-5421 Phoenix QueryServer tests race condition on creating keytab folder
This is an automated email from the ASF dual-hosted git repository.
elserj 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 be34c3b PHOENIX-5421 Phoenix QueryServer tests race condition on
creating keytab folder
be34c3b is described below
commit be34c3b61debcf920fa8b77f2a33e29a09adc052
Author: Mehdi Salarkia
AuthorDate: Wed Oct 9 19:11:00 2019 -0400
PHOENIX-5421 Phoenix QueryServer tests race condition on creating keytab
folder
Closes #8
Signed-off-by: Josh Elser
---
.../src/it/java/org/apache/phoenix/end2end/AbstractKerberisedTest.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/queryserver/src/it/java/org/apache/phoenix/end2end/AbstractKerberisedTest.java
b/queryserver/src/it/java/org/apache/phoenix/end2end/AbstractKerberisedTest.java
index 8ed7ce6..db2d9b6 100644
---
a/queryserver/src/it/java/org/apache/phoenix/end2end/AbstractKerberisedTest.java
+++
b/queryserver/src/it/java/org/apache/phoenix/end2end/AbstractKerberisedTest.java
@@ -44,6 +44,7 @@ import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -98,6 +99,7 @@ public class AbstractKerberisedTest {
sb.append(System.getProperty("user.dir")).append(File.separator);
sb.append("target").append(File.separator);
sb.append(AbstractKerberisedTest.class.getSimpleName());
+sb.append("-").append(UUID.randomUUID());
return sb.toString();
}
[phoenix] 01/03: PHOENIX-5459 Enable running the test suite with JDK11
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 0e06588f52b46bbc6b51c97d52981f18923681fa
Author: Istvan Toth
AuthorDate: Mon Sep 2 11:17:25 2019 +0200
PHOENIX-5459 Enable running the test suite with JDK11
remove unsupported VM option
update surefire and failsafe to 2.22.2
Closes #576
Signed-off-by: Josh Elser
---
pom.xml | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 19a597e..833fec1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,8 +124,8 @@
2.9
1.9.1
-2.20
-2.20
+2.22.2
+2.22.2
2.1
2.5.2
@@ -254,7 +254,7 @@
alphabetical
--Xmx2000m -XX:MaxPermSize=256m
-Djava.security.egd=file:/dev/./urandom
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
-XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops
-XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+DisableExplicitGC
-XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled
-XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/ - [...]
+-Xmx2000m -XX:MaxPermSize=256m
-Djava.security.egd=file:/dev/./urandom
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
-XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops
-XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC
-XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled
-XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/ -Dorg.apache.hadoo
[...]
${test.output.tofile}
kill
${basedir}/src/it/java
@@ -283,7 +283,7 @@
at
org.apache.phoenix.coprocessor.MetaDataEndpointImpl.doGetTable(MetaDataEndpointImpl.java:2835)
at
org.apache.phoenix.coprocessor.MetaDataEndpointImpl.getTable(MetaDataEndpointImpl.java:490)
-->
--Xmx3000m -XX:MaxPermSize=256m
-Djava.security.egd=file:/dev/./urandom
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
-XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops
-XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+DisableExplicitGC
-XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled
-XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/ - [...]
+-Xmx3000m -XX:MaxPermSize=256m
-Djava.security.egd=file:/dev/./urandom
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
-XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops
-XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC
-XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled
-XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/ -Dorg.apache.hadoo
[...]
${test.output.tofile}
kill
${basedir}/src/it/java
[phoenix] 02/03: PHOENIX-5461 phoenix-pherf IT failures with JDK11
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit ea7a21814dbfee181a1b3486b10d01d0b22d653f
Author: Istvan Toth
AuthorDate: Mon Sep 2 13:53:17 2019 +0200
PHOENIX-5461 phoenix-pherf IT failures with JDK11
Closes #578
Signed-off-by: Josh Elser
---
phoenix-pherf/pom.xml | 22 +-
.../apache/phoenix/pherf/configuration/Column.java | 5 -
.../pherf/configuration/XMLConfigParser.java | 16 +++-
.../apache/phoenix/pherf/util/ResourceList.java| 3 ++-
4 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 6ac62b3..31bd638 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -109,11 +109,23 @@
hadoop-minicluster
test
-
- org.mockito
- mockito-all
- test
-
+
+ org.mockito
+ mockito-all
+ test
+
+
+
+ jakarta.activation
+ jakarta.activation-api
+ 1.2.1
+
+
+ org.glassfish.jaxb
+ jaxb-runtime
+ 2.3.2
+ test
+
diff --git
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Column.java
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Column.java
index c121451..60646ea 100644
---
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Column.java
+++
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Column.java
@@ -211,11 +211,6 @@ public class Column {
@XmlElement(name = "datavalue")
public void setDataValues(List dataValues) {
this.dataValues = dataValues;
-
-// DataValue type is inherited from the column
-for (DataValue value : dataValues) {
-value.setType(getType());
-}
}
public String getPrefix() {
diff --git
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java
index 87b4403..104fab5 100644
---
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java
+++
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java
@@ -36,6 +36,7 @@ import javax.xml.transform.stream.StreamSource;
import org.apache.phoenix.pherf.PherfConstants;
import org.apache.phoenix.pherf.exception.FileLoaderException;
+import org.apache.phoenix.pherf.rules.DataValue;
import org.apache.phoenix.pherf.util.ResourceList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -176,7 +177,20 @@ public class XMLConfigParser {
}
for (Path path : this.paths) {
System.out.println("Adding model for path:" + path.toString());
-this.dataModels.add(XMLConfigParser.readDataModel(path));
+DataModel dataModel = XMLConfigParser.readDataModel(path);
+updateDataValueType(dataModel);
+this.dataModels.add(dataModel);
+}
+}
+
+private void updateDataValueType(DataModel dataModel) {
+for (Column column : dataModel.getDataMappingColumns()) {
+if (column.getDataValues() != null) {
+// DataValue type is inherited from the column
+for (DataValue value : column.getDataValues()) {
+value.setType(column.getType());
+}
+}
}
}
diff --git
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/util/ResourceList.java
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/util/ResourceList.java
index df5dbf7..cec12d1 100644
---
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/util/ResourceList.java
+++
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/util/ResourceList.java
@@ -28,6 +28,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.URI;
import java.net.URL;
+import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.*;
@@ -130,7 +131,7 @@ public class ResourceList {
ZipFile zf;
try {
zf = new ZipFile(file);
-} catch (FileNotFoundException e) {
+} catch (FileNotFoundException|NoSuchFileException e) {
// Gracefully handle a jar listed on the classpath that doesn't
actually exist.
return Collections.emptyList();
} catch (final ZipException e) {
[phoenix] 03/03: PHOENIX-5460 SortOrderExpressionTest failure with JDK11
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit a3ff1707f299dd28ac7e43f90d68de1f58ca0342
Author: Istvan Toth
AuthorDate: Mon Sep 2 12:45:40 2019 +0200
PHOENIX-5460 SortOrderExpressionTest failure with JDK11
Closes #577
Signed-off-by: Josh Elser
---
.../apache/phoenix/expression/SortOrderExpressionTest.java| 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/expression/SortOrderExpressionTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/expression/SortOrderExpressionTest.java
index e2ab684..c2850a9 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/expression/SortOrderExpressionTest.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/expression/SortOrderExpressionTest.java
@@ -146,7 +146,16 @@ public class SortOrderExpressionTest {
@Test
public void toChar() throws Exception {
List args = Lists.newArrayList(getInvertedLiteral(date(12,
11, 2001), PDate.INSTANCE));
-evaluateAndAssertResult(new ToCharFunction(args,
FunctionArgumentType.TEMPORAL, "", DateUtil.getDateFormatter("MM/dd/yy hh:mm
a")), "12/11/01 12:00 AM");
+// We may get AM or am depending on Java version, see JDK-8211985
+// This is just a hack to accept any case, without completely
rewriting the test logic
+Object caseInsensitiveExpected = new Object() {
+@Override
+public boolean equals(Object other) {
+return (other instanceof String) && "12/11/01 12:00
AM".equalsIgnoreCase((String) other);
+}
+};
+evaluateAndAssertResult(new ToCharFunction(args,
FunctionArgumentType.TEMPORAL, "", DateUtil.getDateFormatter("MM/dd/yy hh:mm
a")),
+caseInsensitiveExpected);
}
@Test
[phoenix] branch master updated (50a6aeb -> a3ff170)
This is an automated email from the ASF dual-hosted git repository. elserj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git. from 50a6aeb PHOENIX-5455 IndexedKeyValue creation fails after HBASE-22034 new 0e06588 PHOENIX-5459 Enable running the test suite with JDK11 new ea7a218 PHOENIX-5461 phoenix-pherf IT failures with JDK11 new a3ff170 PHOENIX-5460 SortOrderExpressionTest failure with JDK11 The 3 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. Summary of changes: .../expression/SortOrderExpressionTest.java| 11 ++- phoenix-pherf/pom.xml | 22 +- .../apache/phoenix/pherf/configuration/Column.java | 5 - .../pherf/configuration/XMLConfigParser.java | 16 +++- .../apache/phoenix/pherf/util/ResourceList.java| 3 ++- pom.xml| 8 6 files changed, 48 insertions(+), 17 deletions(-)
[phoenix-queryserver] branch master updated: PHOENIX-5459 Enable running the test suite with JDK11
This is an automated email from the ASF dual-hosted git repository.
elserj 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 c4c9a8a PHOENIX-5459 Enable running the test suite with JDK11
c4c9a8a is described below
commit c4c9a8a4a831854b8a6a38487ce7a2f2bd8de9f5
Author: Istvan Toth
AuthorDate: Mon Sep 2 11:22:16 2019 +0200
PHOENIX-5459 Enable running the test suite with JDK11
remove unsupported VM option
update surefire and failsafe to 2.22.2
Closes #10
Signed-off-by: Josh Elser
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4123556..9f8cc87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,8 +85,8 @@
2.9
1.9.1
-2.20
-2.20
+2.22.2
+2.22.2
2.1
2.5.2
@@ -203,7 +203,7 @@
alphabetical
false
alphabetical
--Xmx2000m -XX:MaxPermSize=256m
-Djava.security.egd=file:/dev/./urandom
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
-XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops
-XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+DisableExplicitGC
-XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled
-XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDump [...]
+-Xmx2000m -XX:MaxPermSize=256m
-Djava.security.egd=file:/dev/./urandom
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
-XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops
-XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC
-XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled
-XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/
true
kill
${basedir}/src/it/java
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5428 Upgrade maven-checkstyle-plugin version
This is an automated email from the ASF dual-hosted git repository. elserj pushed a commit to branch 4.x-HBase-1.5 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.5 by this push: new 0012816 PHOENIX-5428 Upgrade maven-checkstyle-plugin version 0012816 is described below commit 00128168a32283a3de832f42478c4433c89d8daf Author: Istvan Toth AuthorDate: Tue Aug 6 15:19:48 2019 +0200 PHOENIX-5428 Upgrade maven-checkstyle-plugin version This upgrades maven-checkstyle-plugin to 3.1.0 and updates the checker.xml config files to work with recent checkstyle versions Closes #565 Signed-off-by: Josh Elser --- .../src/main/config/checkstyle/checker.xml | 39 +- pom.xml| 2 +- src/main/config/checkstyle/checker.xml | 39 +- 3 files changed, 33 insertions(+), 47 deletions(-) diff --git a/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml b/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml index ecf3946..323aac0 100755 --- a/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml +++ b/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml @@ -57,7 +57,6 @@ limitations under the License. - @@ -90,10 +89,6 @@ limitations under the License. - - - - @@ -256,26 +251,24 @@ limitations under the License. - - - + + + + + + - - - - - - + + + + + - - - - + + + + + - - - - - diff --git a/pom.xml b/pom.xml index 014ec8e..ff14eaf 100644 --- a/pom.xml +++ b/pom.xml @@ -389,7 +389,7 @@ org.apache.maven.plugins maven-checkstyle-plugin -2.13 +3.1.0 validate diff --git a/src/main/config/checkstyle/checker.xml b/src/main/config/checkstyle/checker.xml index ecf3946..323aac0 100644 --- a/src/main/config/checkstyle/checker.xml +++ b/src/main/config/checkstyle/checker.xml @@ -57,7 +57,6 @@ limitations under the License. - @@ -90,10 +89,6 @@ limitations under the License. - - - - @@ -256,26 +251,24 @@ limitations under the License. - - - + + + + + + - - - - - - + + + + + - - - - + + + + + - - - - -
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5428 Upgrade maven-checkstyle-plugin version
This is an automated email from the ASF dual-hosted git repository. elserj pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push: new 0d2974d PHOENIX-5428 Upgrade maven-checkstyle-plugin version 0d2974d is described below commit 0d2974d57a270e8ab729128529e976857deb7ea3 Author: Istvan Toth AuthorDate: Tue Aug 6 15:19:48 2019 +0200 PHOENIX-5428 Upgrade maven-checkstyle-plugin version This upgrades maven-checkstyle-plugin to 3.1.0 and updates the checker.xml config files to work with recent checkstyle versions Closes #565 Signed-off-by: Josh Elser --- .../src/main/config/checkstyle/checker.xml | 39 +- pom.xml| 2 +- src/main/config/checkstyle/checker.xml | 39 +- 3 files changed, 33 insertions(+), 47 deletions(-) diff --git a/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml b/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml index ecf3946..323aac0 100755 --- a/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml +++ b/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml @@ -57,7 +57,6 @@ limitations under the License. - @@ -90,10 +89,6 @@ limitations under the License. - - - - @@ -256,26 +251,24 @@ limitations under the License. - - - + + + + + + - - - - - - + + + + + - - - - + + + + + - - - - - diff --git a/pom.xml b/pom.xml index 32b2368..5dc6e76 100644 --- a/pom.xml +++ b/pom.xml @@ -385,7 +385,7 @@ org.apache.maven.plugins maven-checkstyle-plugin -2.13 +3.1.0 validate diff --git a/src/main/config/checkstyle/checker.xml b/src/main/config/checkstyle/checker.xml index ecf3946..323aac0 100644 --- a/src/main/config/checkstyle/checker.xml +++ b/src/main/config/checkstyle/checker.xml @@ -57,7 +57,6 @@ limitations under the License. - @@ -90,10 +89,6 @@ limitations under the License. - - - - @@ -256,26 +251,24 @@ limitations under the License. - - - + + + + + + - - - - - - + + + + + - - - - + + + + + - - - - -
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5428 Upgrade maven-checkstyle-plugin version
This is an automated email from the ASF dual-hosted git repository. elserj pushed a commit to branch 4.x-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push: new dc319c7 PHOENIX-5428 Upgrade maven-checkstyle-plugin version dc319c7 is described below commit dc319c7d31a3dbf0813ce62750e119155fde432e Author: Istvan Toth AuthorDate: Tue Aug 6 15:19:48 2019 +0200 PHOENIX-5428 Upgrade maven-checkstyle-plugin version This upgrades maven-checkstyle-plugin to 3.1.0 and updates the checker.xml config files to work with recent checkstyle versions Closes #565 Signed-off-by: Josh Elser --- .../src/main/config/checkstyle/checker.xml | 39 +- pom.xml| 2 +- src/main/config/checkstyle/checker.xml | 39 +- 3 files changed, 33 insertions(+), 47 deletions(-) diff --git a/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml b/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml index ecf3946..323aac0 100755 --- a/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml +++ b/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml @@ -57,7 +57,6 @@ limitations under the License. - @@ -90,10 +89,6 @@ limitations under the License. - - - - @@ -256,26 +251,24 @@ limitations under the License. - - - + + + + + + - - - - - - + + + + + - - - - + + + + + - - - - - diff --git a/pom.xml b/pom.xml index a7ac5b6..44b2f0f 100644 --- a/pom.xml +++ b/pom.xml @@ -385,7 +385,7 @@ org.apache.maven.plugins maven-checkstyle-plugin -2.13 +3.1.0 validate diff --git a/src/main/config/checkstyle/checker.xml b/src/main/config/checkstyle/checker.xml index ecf3946..323aac0 100644 --- a/src/main/config/checkstyle/checker.xml +++ b/src/main/config/checkstyle/checker.xml @@ -57,7 +57,6 @@ limitations under the License. - @@ -90,10 +89,6 @@ limitations under the License. - - - - @@ -256,26 +251,24 @@ limitations under the License. - - - + + + + + + - - - - - - + + + + + - - - - + + + + + - - - - -
[phoenix] branch master updated: PHOENIX-5428 Upgrade maven-checkstyle-plugin version
This is an automated email from the ASF dual-hosted git repository. elserj 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 c60b91a PHOENIX-5428 Upgrade maven-checkstyle-plugin version c60b91a is described below commit c60b91a431bfd2184e861c909136bb4c17c5b91b Author: Istvan Toth AuthorDate: Tue Aug 6 15:19:48 2019 +0200 PHOENIX-5428 Upgrade maven-checkstyle-plugin version This upgrades maven-checkstyle-plugin to 3.1.0 and updates the checker.xml config files to work with recent checkstyle versions Closes #565 Signed-off-by: Josh Elser --- .../src/main/config/checkstyle/checker.xml | 39 +- pom.xml| 2 +- src/main/config/checkstyle/checker.xml | 39 +- 3 files changed, 33 insertions(+), 47 deletions(-) diff --git a/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml b/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml index ecf3946..323aac0 100755 --- a/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml +++ b/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml @@ -57,7 +57,6 @@ limitations under the License. - @@ -90,10 +89,6 @@ limitations under the License. - - - - @@ -256,26 +251,24 @@ limitations under the License. - - - + + + + + + - - - - - - + + + + + - - - - + + + + + - - - - - diff --git a/pom.xml b/pom.xml index 2579079..19a597e 100644 --- a/pom.xml +++ b/pom.xml @@ -385,7 +385,7 @@ org.apache.maven.plugins maven-checkstyle-plugin -2.13 +3.1.0 validate diff --git a/src/main/config/checkstyle/checker.xml b/src/main/config/checkstyle/checker.xml index ecf3946..323aac0 100644 --- a/src/main/config/checkstyle/checker.xml +++ b/src/main/config/checkstyle/checker.xml @@ -57,7 +57,6 @@ limitations under the License. - @@ -90,10 +89,6 @@ limitations under the License. - - - - @@ -256,26 +251,24 @@ limitations under the License. - - - + + + + + + - - - - - - + + + + + - - - - + + + + + - - - - -
[phoenix-queryserver] branch master updated: PHOENIX-5393 Add _HOST expansion to SPNEGO login
This is an automated email from the ASF dual-hosted git repository.
elserj 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 fc9ed81 PHOENIX-5393 Add _HOST expansion to SPNEGO login
fc9ed81 is described below
commit fc9ed816ab26cbf8b92af2df559b56a552016887
Author: Josh Elser
AuthorDate: Wed Jul 17 13:35:50 2019 -0400
PHOENIX-5393 Add _HOST expansion to SPNEGO login
Closes #6
---
.../phoenix/queryserver/server/QueryServer.java| 30 ++---
.../queryserver/server/QueryServerTest.java| 75 ++
2 files changed, 97 insertions(+), 8 deletions(-)
diff --git
a/queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
b/queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
index 4766394..5f39362 100644
---
a/queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
+++
b/queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
@@ -286,18 +286,12 @@ public final class QueryServer extends Configured
implements Tool, Runnable {
}
@VisibleForTesting
- void configureSpnegoAuthentication(HttpServer.Builder builder,
UserGroupInformation ugi) {
+ void configureSpnegoAuthentication(HttpServer.Builder builder,
UserGroupInformation ugi) throws IOException {
String keytabPath =
getConf().get(QueryServices.QUERY_SERVER_KEYTAB_FILENAME_ATTRIB);
File keytab = new File(keytabPath);
String httpKeytabPath =
getConf().get(QueryServices.QUERY_SERVER_HTTP_KEYTAB_FILENAME_ATTRIB, null);
-String httpPrincipal =
-
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB, null);
-// Backwards compat for a configuration key change
-if (httpPrincipal == null) {
- httpPrincipal =
-
getConf().get(QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB_LEGACY,
null);
-}
+String httpPrincipal = getSpnegoPrincipal(getConf());
File httpKeytab = null;
if (null != httpKeytabPath) {
httpKeytab = new File(httpKeytabPath);
@@ -316,6 +310,26 @@ public final class QueryServer extends Configured
implements Tool, Runnable {
}
}
+ /**
+ * Returns the Kerberos principal to use for SPNEGO, substituting {@code
_HOST}
+ * if it is present as the "instance" component of the Kerberos principal.
It returns
+ * the configured principal as-is if {@code _HOST} is not the "instance".
+ */
+ String getSpnegoPrincipal(Configuration conf) throws IOException {
+String httpPrincipal = conf.get(
+QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB, null);
+// Backwards compat for a configuration key change
+if (httpPrincipal == null) {
+ httpPrincipal = conf.get(
+ QueryServices.QUERY_SERVER_KERBEROS_HTTP_PRINCIPAL_ATTRIB_LEGACY,
null);
+}
+
+String hostname = Strings.domainNamePointerToHostName(DNS.getDefaultHost(
+conf.get(QueryServices.QUERY_SERVER_DNS_INTERFACE_ATTRIB, "default"),
+conf.get(QueryServices.QUERY_SERVER_DNS_NAMESERVER_ATTRIB,
"default")));
+return SecurityUtil.getServerPrincipal(httpPrincipal, hostname);
+ }
+
@VisibleForTesting
UserGroupInformation getUserGroupInformation() throws IOException {
UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
diff --git
a/queryserver/src/test/java/org/apache/phoenix/queryserver/server/QueryServerTest.java
b/queryserver/src/test/java/org/apache/phoenix/queryserver/server/QueryServerTest.java
new file mode 100644
index 000..243e713
--- /dev/null
+++
b/queryserver/src/test/java/org/apache/phoenix/queryserver/server/QueryServerTest.java
@@ -0,0 +1,75 @@
+/*
+ * 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.queryserver.server;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.net.InetAddress;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.phoenix.query.QueryServices;
+imp
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5370 More missing license headers (addendum)
This is an automated email from the ASF dual-hosted git repository. elserj pushed a commit to branch 4.x-HBase-1.5 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.5 by this push: new aa019a7 PHOENIX-5370 More missing license headers (addendum) aa019a7 is described below commit aa019a7dad0b74e7da2852cc787748ad9257eae7 Author: Josh Elser AuthorDate: Tue Jun 25 16:05:54 2019 -0400 PHOENIX-5370 More missing license headers (addendum) --- .../phoenix/end2end/PermissionNSDisabledIT.java | 17 + .../apache/phoenix/end2end/PermissionNSEnabledIT.java | 17 + .../apache/phoenix/coprocessor/tasks/BaseTask.java| 17 + .../phoenix/coprocessor/tasks/DropChildViewsTask.java | 19 ++- .../phoenix/coprocessor/tasks/IndexRebuildTask.java | 19 ++- .../java/org/apache/phoenix/schema/task/Task.java | 17 + 6 files changed, 104 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java index 82c567f..44fa227 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java @@ -1,3 +1,20 @@ +/* + * 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.BeforeClass; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java index 10cf5c1..22fc297 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java @@ -1,3 +1,20 @@ +/* + * 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.apache.hadoop.hbase.security.AccessDeniedException; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java index 5c9a5c4..b0a24aa 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java @@ -1,3 +1,20 @@ +/* + * 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.coprocessor.tasks; import org.apache
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5370 More missing license headers (addendum)
This is an automated email from the ASF dual-hosted git repository. elserj pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push: new e69931c PHOENIX-5370 More missing license headers (addendum) e69931c is described below commit e69931ca476cbf61e7fc4f5454c48a859a9a6d83 Author: Josh Elser AuthorDate: Tue Jun 25 16:05:54 2019 -0400 PHOENIX-5370 More missing license headers (addendum) --- .../phoenix/end2end/PermissionNSDisabledIT.java | 17 + .../apache/phoenix/end2end/PermissionNSEnabledIT.java | 17 + .../apache/phoenix/coprocessor/tasks/BaseTask.java| 17 + .../phoenix/coprocessor/tasks/DropChildViewsTask.java | 19 ++- .../phoenix/coprocessor/tasks/IndexRebuildTask.java | 19 ++- .../java/org/apache/phoenix/schema/task/Task.java | 17 + 6 files changed, 104 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java index 82c567f..44fa227 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java @@ -1,3 +1,20 @@ +/* + * 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.BeforeClass; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java index 10cf5c1..22fc297 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java @@ -1,3 +1,20 @@ +/* + * 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.apache.hadoop.hbase.security.AccessDeniedException; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java index 5c9a5c4..b0a24aa 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java @@ -1,3 +1,20 @@ +/* + * 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.coprocessor.tasks; import org.apache
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5370 More missing license headers (addendum)
This is an automated email from the ASF dual-hosted git repository. elserj pushed a commit to branch 4.x-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push: new c9eacd5 PHOENIX-5370 More missing license headers (addendum) c9eacd5 is described below commit c9eacd546e8aaa13383017a6dfdefadcc437a027 Author: Josh Elser AuthorDate: Tue Jun 25 16:05:54 2019 -0400 PHOENIX-5370 More missing license headers (addendum) --- .../phoenix/end2end/PermissionNSDisabledIT.java | 17 + .../apache/phoenix/end2end/PermissionNSEnabledIT.java | 17 + .../apache/phoenix/coprocessor/tasks/BaseTask.java| 17 + .../phoenix/coprocessor/tasks/DropChildViewsTask.java | 19 ++- .../phoenix/coprocessor/tasks/IndexRebuildTask.java | 19 ++- .../java/org/apache/phoenix/schema/task/Task.java | 17 + 6 files changed, 104 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java index 82c567f..44fa227 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java @@ -1,3 +1,20 @@ +/* + * 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.BeforeClass; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java index 10cf5c1..22fc297 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java @@ -1,3 +1,20 @@ +/* + * 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.apache.hadoop.hbase.security.AccessDeniedException; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java index 5c9a5c4..b0a24aa 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java @@ -1,3 +1,20 @@ +/* + * 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.coprocessor.tasks; import org.apache
[phoenix] branch master updated: PHOENIX-5370 More missing license headers (addendum)
This is an automated email from the ASF dual-hosted git repository. elserj 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 ebea083 PHOENIX-5370 More missing license headers (addendum) ebea083 is described below commit ebea0833e5822b95f18612860d6d54d806cd4507 Author: Josh Elser AuthorDate: Tue Jun 25 16:05:54 2019 -0400 PHOENIX-5370 More missing license headers (addendum) --- .../phoenix/end2end/PermissionNSDisabledIT.java | 17 + .../apache/phoenix/end2end/PermissionNSEnabledIT.java | 17 + .../apache/phoenix/coprocessor/tasks/BaseTask.java| 17 + .../phoenix/coprocessor/tasks/DropChildViewsTask.java | 19 ++- .../phoenix/coprocessor/tasks/IndexRebuildTask.java | 19 ++- .../java/org/apache/phoenix/schema/task/Task.java | 17 + 6 files changed, 104 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java index 82c567f..44fa227 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSDisabledIT.java @@ -1,3 +1,20 @@ +/* + * 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.BeforeClass; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java index 10cf5c1..22fc297 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PermissionNSEnabledIT.java @@ -1,3 +1,20 @@ +/* + * 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.apache.hadoop.hbase.security.AccessDeniedException; diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java index 5c9a5c4..b0a24aa 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/tasks/BaseTask.java @@ -1,3 +1,20 @@ +/* + * 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.coprocessor.tasks; import org.apache.hadoop.hbase.cop
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5370 Add missing license headers and consolidate headers on POMs
This is an automated email from the ASF dual-hosted git repository. elserj pushed a commit to branch 4.x-HBase-1.5 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.5 by this push: new 23e0d56 PHOENIX-5370 Add missing license headers and consolidate headers on POMs 23e0d56 is described below commit 23e0d56bac743d2fa748fee7872830147f3ae693 Author: Josh Elser AuthorDate: Tue Jun 25 12:22:41 2019 -0400 PHOENIX-5370 Add missing license headers and consolidate headers on POMs --- bin/hbase-omid-client-config.yml | 15 +++ phoenix-assembly/pom.xml | 31 +-- phoenix-client/pom.xml | 31 +-- phoenix-core/pom.xml | 17 + phoenix-pherf/pom.xml| 28 +--- phoenix-server/pom.xml | 33 +++-- phoenix-tracing-webapp/pom.xml | 35 +++ pom.xml | 17 + 8 files changed, 122 insertions(+), 85 deletions(-) diff --git a/bin/hbase-omid-client-config.yml b/bin/hbase-omid-client-config.yml index 0c286c2..b3301d4 100644 --- a/bin/hbase-omid-client-config.yml +++ b/bin/hbase-omid-client-config.yml @@ -1,3 +1,18 @@ +# 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. #Omid TSO connection connectionType: !!org.apache.omid.tso.client.OmidClientConfiguration$ConnType DIRECT diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 2991ff1..a997a8f 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -1,25 +1,20 @@ - + - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 15b6ddc..4107da5 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -1,25 +1,20 @@ - + - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 348fa20..82d92e8 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -1,3 +1,20 @@ + + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 7839c8f..c1a1d6b 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -1,14 +1,20 @@ - + + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> 4.0.0 diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 74b4ec8..e63dbeb 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -1,25 +1,22 @@ - + - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index 2b6a984..a150892 100755 --- a/phoenix-tracing-webapp/pom.xml +++ b/phoenix-tracing-webapp/pom.xml @@ -1,26 +1,21 @@ - - - - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 diff --git a/pom.xml b/pom.xml index 504c75c..014ec8e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,20 @@ + + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0
[phoenix] branch master updated: PHOENIX-5370 Add missing license headers and consolidate headers on POMs
This is an automated email from the ASF dual-hosted git repository. elserj 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 743e5a1 PHOENIX-5370 Add missing license headers and consolidate headers on POMs 743e5a1 is described below commit 743e5a102e71fe890f9835ca0f1ff674d52165c3 Author: Josh Elser AuthorDate: Tue Jun 25 12:22:41 2019 -0400 PHOENIX-5370 Add missing license headers and consolidate headers on POMs --- bin/hbase-omid-client-config.yml | 15 +++ phoenix-assembly/pom.xml | 35 +++ phoenix-client/pom.xml | 31 +-- phoenix-core/pom.xml | 17 + phoenix-pherf/pom.xml| 28 +--- phoenix-server/pom.xml | 33 +++-- phoenix-tracing-webapp/pom.xml | 35 +++ pom.xml | 17 + 8 files changed, 124 insertions(+), 87 deletions(-) diff --git a/bin/hbase-omid-client-config.yml b/bin/hbase-omid-client-config.yml index 0c286c2..b3301d4 100644 --- a/bin/hbase-omid-client-config.yml +++ b/bin/hbase-omid-client-config.yml @@ -1,3 +1,18 @@ +# 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. #Omid TSO connection connectionType: !!org.apache.omid.tso.client.OmidClientConfiguration$ConnType DIRECT diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index f89c722..ec3f5da 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -1,25 +1,20 @@ - + - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index f6dd599..b8ee4a2 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -1,25 +1,20 @@ - + - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index b5efd98..12deece 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -1,3 +1,20 @@ + + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index b35200c..6ac62b3 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -1,14 +1,20 @@ - + + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> 4.0.0 diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index bf6ea8d..d2a1648 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -1,25 +1,22 @@ - + - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index 80539a1..2f79c23 100755 --- a/phoenix-tracing-webapp/pom.xml +++ b/phoenix-tracing-webapp/pom.xml @@ -1,26 +1,21 @@ - - - - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 diff --git a/pom.xml b/pom.xml index dd6203b..2579079 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,20 @@ + + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5370 Add missing license headers and consolidate headers on POMs
This is an automated email from the ASF dual-hosted git repository. elserj pushed a commit to branch 4.x-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push: new 9f4b585 PHOENIX-5370 Add missing license headers and consolidate headers on POMs 9f4b585 is described below commit 9f4b585e7ce7dbd0295d9aee688a9dc943cbc6b1 Author: Josh Elser AuthorDate: Tue Jun 25 12:22:41 2019 -0400 PHOENIX-5370 Add missing license headers and consolidate headers on POMs --- bin/hbase-omid-client-config.yml | 15 +++ phoenix-assembly/pom.xml | 31 +-- phoenix-client/pom.xml | 31 +-- phoenix-core/pom.xml | 17 + phoenix-pherf/pom.xml| 28 +--- phoenix-server/pom.xml | 33 +++-- phoenix-tracing-webapp/pom.xml | 35 +++ pom.xml | 17 + 8 files changed, 122 insertions(+), 85 deletions(-) diff --git a/bin/hbase-omid-client-config.yml b/bin/hbase-omid-client-config.yml index 0c286c2..b3301d4 100644 --- a/bin/hbase-omid-client-config.yml +++ b/bin/hbase-omid-client-config.yml @@ -1,3 +1,18 @@ +# 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. #Omid TSO connection connectionType: !!org.apache.omid.tso.client.OmidClientConfiguration$ConnType DIRECT diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 1715b26..c109b43 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -1,25 +1,20 @@ - + - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index e5165d9..fc551ed 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -1,25 +1,20 @@ - + - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 6ed1e13..1d3b725 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -1,3 +1,20 @@ + + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 5b7a05b..2c0a887 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -1,14 +1,20 @@ - + + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> 4.0.0 diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 5cf04c3..008924d 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -1,25 +1,22 @@ - + - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index 363caa7..823221f 100755 --- a/phoenix-tracing-webapp/pom.xml +++ b/phoenix-tracing-webapp/pom.xml @@ -1,26 +1,21 @@ - - - - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 diff --git a/pom.xml b/pom.xml index 6197fc2..a7ac5b6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,20 @@ + + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5370 Add missing license headers and consolidate headers on POMs
This is an automated email from the ASF dual-hosted git repository. elserj pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push: new 6a77c72 PHOENIX-5370 Add missing license headers and consolidate headers on POMs 6a77c72 is described below commit 6a77c72e1e356c0639add0a9d8763114b62d3d95 Author: Josh Elser AuthorDate: Tue Jun 25 12:22:41 2019 -0400 PHOENIX-5370 Add missing license headers and consolidate headers on POMs --- bin/hbase-omid-client-config.yml | 15 +++ phoenix-assembly/pom.xml | 31 +-- phoenix-client/pom.xml | 31 +-- phoenix-core/pom.xml | 17 + phoenix-pherf/pom.xml| 28 +--- phoenix-server/pom.xml | 33 +++-- phoenix-tracing-webapp/pom.xml | 35 +++ pom.xml | 17 + 8 files changed, 122 insertions(+), 85 deletions(-) diff --git a/bin/hbase-omid-client-config.yml b/bin/hbase-omid-client-config.yml index 0c286c2..b3301d4 100644 --- a/bin/hbase-omid-client-config.yml +++ b/bin/hbase-omid-client-config.yml @@ -1,3 +1,18 @@ +# 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. #Omid TSO connection connectionType: !!org.apache.omid.tso.client.OmidClientConfiguration$ConnType DIRECT diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 2ee0ad8..3bfcd8c 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -1,25 +1,20 @@ - + - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 9143b9a..b5ee645 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -1,25 +1,20 @@ - + - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 8a80937..763e0ce 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -1,3 +1,20 @@ + + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 3fff937..33fe8c5 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -1,14 +1,20 @@ - + + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> 4.0.0 diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index ba76460..4b092c2 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -1,25 +1,22 @@ - + - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index dfe8561..c5098a9 100755 --- a/phoenix-tracing-webapp/pom.xml +++ b/phoenix-tracing-webapp/pom.xml @@ -1,26 +1,21 @@ - - - - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 diff --git a/pom.xml b/pom.xml index 302fc88..31ac45d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,20 @@ + + http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0
svn commit: r1860964 [1/3] - in /phoenix/site/publish/language: datatypes.html functions.html index.html
Author: elserj Date: Mon Jun 10 16:37:05 2019 New Revision: 1860964 URL: http://svn.apache.org/viewvc?rev=1860964=rev Log: Regenerating broken docs 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=1860964=1860963=1860964=diff == --- phoenix/site/publish/language/datatypes.html (original) +++ phoenix/site/publish/language/datatypes.html Mon Jun 10 16:37:05 2019 @@ -1,7 +1,7 @@ @@ -165,7 +165,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
svn commit: r1860964 [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=1860964=1860963=1860964=diff
==
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Mon Jun 10 16:37:05 2019
@@ -1,7 +1,7 @@
@@ -165,7 +165,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: r1860964 [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=1860964=1860963=1860964=diff
==
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Mon Jun 10 16:37:05 2019
@@ -1,7 +1,7 @@
@@ -165,7 +165,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
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5297 POM cleanup and de-duplication
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch 4.x-HBase-1.5
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.5 by this push:
new 538392d PHOENIX-5297 POM cleanup and de-duplication
538392d is described below
commit 538392d7b8a1a9acf0966c4fc372c36edf8de320
Author: Josh Elser
AuthorDate: Fri May 24 12:02:11 2019 -0400
PHOENIX-5297 POM cleanup and de-duplication
Signed-off-by: Geoffrey Jacoby
---
phoenix-core/pom.xml | 14 --
phoenix-pherf/pom.xml | 7 ---
pom.xml | 8
3 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index e08445f..be677dd 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -10,20 +10,6 @@
Phoenix Core
Core Phoenix codebase
-
-
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
- repo
-
-
-
-
-
- Apache Software Foundation
- http://www.apache.org
-
-
${project.basedir}/..
0.8.1
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index c50a544..7839c8f 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -27,13 +27,6 @@
org.apache.phoenix.shaded
-
-
- apache release
-
https://repository.apache.org/content/repositories/releases/
-
-
-
org.apache.phoenix
diff --git a/pom.xml b/pom.xml
index f31dbf1..dfc2bf5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ https://www.apache.org/licenses/LICENSE-2.0.txt
repo
@@ -19,7 +19,7 @@
Apache Software Foundation
-http://www.apache.org
+https://www.apache.org
@@ -45,7 +45,7 @@
-
scm:git:http://git-wip-us.apache.org/repos/asf/phoenix.git
+
scm:git:https://git-wip-us.apache.org/repos/asf/phoenix.git
https://git-wip-us.apache.org/repos/asf/phoenix.git
scm:git:https://git-wip-us.apache.org/repos/asf/phoenix.git
@@ -409,7 +409,7 @@
true
-http://hbase.apache.org/apidocs/
+https://hbase.apache.org/apidocs/
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5297 POM cleanup and de-duplication
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch 4.x-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push:
new ad69aa6 PHOENIX-5297 POM cleanup and de-duplication
ad69aa6 is described below
commit ad69aa6420ef1225cda685b756ad04f3bc64078c
Author: Josh Elser
AuthorDate: Fri May 24 12:02:11 2019 -0400
PHOENIX-5297 POM cleanup and de-duplication
Signed-off-by: Geoffrey Jacoby
---
phoenix-core/pom.xml | 14 --
phoenix-pherf/pom.xml | 7 ---
pom.xml | 8
3 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index e16449b..9a66736 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -10,20 +10,6 @@
Phoenix Core
Core Phoenix codebase
-
-
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
- repo
-
-
-
-
-
- Apache Software Foundation
- http://www.apache.org
-
-
${project.basedir}/..
0.8.1
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 7a346b8..5b7a05b 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -27,13 +27,6 @@
org.apache.phoenix.shaded
-
-
- apache release
-
https://repository.apache.org/content/repositories/releases/
-
-
-
org.apache.phoenix
diff --git a/pom.xml b/pom.xml
index cde97f9..acd8a52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ https://www.apache.org/licenses/LICENSE-2.0.txt
repo
@@ -19,7 +19,7 @@
Apache Software Foundation
-http://www.apache.org
+https://www.apache.org
@@ -45,7 +45,7 @@
-
scm:git:http://git-wip-us.apache.org/repos/asf/phoenix.git
+
scm:git:https://git-wip-us.apache.org/repos/asf/phoenix.git
https://git-wip-us.apache.org/repos/asf/phoenix.git
scm:git:https://git-wip-us.apache.org/repos/asf/phoenix.git
@@ -409,7 +409,7 @@
true
-http://hbase.apache.org/apidocs/
+https://hbase.apache.org/apidocs/
[phoenix] branch master updated: PHOENIX-5297 POM cleanup and de-duplication
This is an automated email from the ASF dual-hosted git repository.
elserj 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 fffd21a PHOENIX-5297 POM cleanup and de-duplication
fffd21a is described below
commit fffd21aea72ec47a36adcb7d3ba778a15fd7dc10
Author: Josh Elser
AuthorDate: Fri May 24 12:02:11 2019 -0400
PHOENIX-5297 POM cleanup and de-duplication
Signed-off-by: Geoffrey Jacoby
---
phoenix-core/pom.xml | 14 --
phoenix-pherf/pom.xml | 7 ---
pom.xml | 8
3 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index aa58901..bf4b815 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -10,20 +10,6 @@
Phoenix Core
Core Phoenix codebase
-
-
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
- repo
-
-
-
-
-
- Apache Software Foundation
- http://www.apache.org
-
-
${project.basedir}/..
0.8.1
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 6456ace..b35200c 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -27,13 +27,6 @@
org.apache.phoenix.shaded
-
-
- apache release
-
https://repository.apache.org/content/repositories/releases/
-
-
-
org.apache.phoenix
diff --git a/pom.xml b/pom.xml
index 937b487..dd6203b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ https://www.apache.org/licenses/LICENSE-2.0.txt
repo
@@ -19,7 +19,7 @@
Apache Software Foundation
-http://www.apache.org
+https://www.apache.org
@@ -45,7 +45,7 @@
-
scm:git:http://git-wip-us.apache.org/repos/asf/phoenix.git
+
scm:git:https://git-wip-us.apache.org/repos/asf/phoenix.git
https://git-wip-us.apache.org/repos/asf/phoenix.git
scm:git:https://git-wip-us.apache.org/repos/asf/phoenix.git
@@ -409,7 +409,7 @@
true
-http://hbase.apache.org/apidocs/
+https://hbase.apache.org/apidocs/
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5297 POM cleanup and de-duplication
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch 4.x-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push:
new 977d38d PHOENIX-5297 POM cleanup and de-duplication
977d38d is described below
commit 977d38dd4e1a2b61f2307175f5c8104833bf9c95
Author: Josh Elser
AuthorDate: Fri May 24 12:02:11 2019 -0400
PHOENIX-5297 POM cleanup and de-duplication
Signed-off-by: Geoffrey Jacoby
---
phoenix-core/pom.xml | 14 --
phoenix-pherf/pom.xml | 7 ---
pom.xml | 8
3 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 12b291c..adebe34 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -10,20 +10,6 @@
Phoenix Core
Core Phoenix codebase
-
-
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
- repo
-
-
-
-
-
- Apache Software Foundation
- http://www.apache.org
-
-
${project.basedir}/..
0.8.1
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 747ec40..3fff937 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -27,13 +27,6 @@
org.apache.phoenix.shaded
-
-
- apache release
-
https://repository.apache.org/content/repositories/releases/
-
-
-
org.apache.phoenix
diff --git a/pom.xml b/pom.xml
index 3f2fb4e..302fc88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ https://www.apache.org/licenses/LICENSE-2.0.txt
repo
@@ -19,7 +19,7 @@
Apache Software Foundation
-http://www.apache.org
+https://www.apache.org
@@ -45,7 +45,7 @@
-
scm:git:http://git-wip-us.apache.org/repos/asf/phoenix.git
+
scm:git:https://git-wip-us.apache.org/repos/asf/phoenix.git
https://git-wip-us.apache.org/repos/asf/phoenix.git
scm:git:https://git-wip-us.apache.org/repos/asf/phoenix.git
@@ -409,7 +409,7 @@
true
-http://hbase.apache.org/apidocs/
+https://hbase.apache.org/apidocs/
[phoenix] branch 4.x-HBase-1.5 updated (b3e29b2 -> 0033dc6)
This is an automated email from the ASF dual-hosted git repository. elserj pushed a change to branch 4.x-HBase-1.5 in repository https://gitbox.apache.org/repos/asf/phoenix.git. from b3e29b2 IndexRebuildTaskIT fails with HBase 1.5.x. new 5f67fad Revert "IndexRebuildTaskIT fails with HBase 1.5.x." new 0033dc6 PHOENIX-5289 IndexRebuildTaskIT fails with HBase 1.5.x. The 2 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. Summary of changes:
[phoenix] 02/02: PHOENIX-5289 IndexRebuildTaskIT fails with HBase 1.5.x.
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch 4.x-HBase-1.5
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 0033dc62ee9700cda68fc97f8e82dfa14a4801b7
Author: Lars Hofhansl
AuthorDate: Wed May 22 13:14:27 2019 -0400
PHOENIX-5289 IndexRebuildTaskIT fails with HBase 1.5.x.
Re-applying the original change with correct commit msg.
---
.../java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
index f01dc06..5ad2435 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
@@ -53,7 +53,10 @@ public class IndexedKeyValue extends KeyValue {
public IndexedKeyValue() {}
public IndexedKeyValue(byte[] bs, Mutation mutation) {
-super(mutation.getRow(), 0, mutation.getRow().length);
+this.bytes = mutation.getRow();
+this.offset = 0;
+this.length = mutation.getRow().length;
+
this.indexTableName = new ImmutableBytesPtr(bs);
this.mutation = mutation;
this.hashCode = calcHashCode(indexTableName, mutation);
[phoenix] 01/02: Revert "IndexRebuildTaskIT fails with HBase 1.5.x."
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch 4.x-HBase-1.5
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 5f67fadbe6a5b4c95ceb713d1e0ceac712f45b18
Author: Josh Elser
AuthorDate: Wed May 22 13:14:16 2019 -0400
Revert "IndexRebuildTaskIT fails with HBase 1.5.x."
This reverts commit b3e29b24ba2be24fa95dbd7a651dc8dc5f4640b3.
Reverting to reapply with correct commit msg.
---
.../java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
index 5ad2435..f01dc06 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
@@ -53,10 +53,7 @@ public class IndexedKeyValue extends KeyValue {
public IndexedKeyValue() {}
public IndexedKeyValue(byte[] bs, Mutation mutation) {
-this.bytes = mutation.getRow();
-this.offset = 0;
-this.length = mutation.getRow().length;
-
+super(mutation.getRow(), 0, mutation.getRow().length);
this.indexTableName = new ImmutableBytesPtr(bs);
this.mutation = mutation;
this.hashCode = calcHashCode(indexTableName, mutation);
[phoenix] 02/02: PHOENIX-5289 IndexRebuildTaskIT fails with HBase 1.5.x.
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit c84beaf695dbbd53de57e52b84300d93767902f6
Author: Lars Hofhansl
AuthorDate: Wed May 22 13:13:00 2019 -0400
PHOENIX-5289 IndexRebuildTaskIT fails with HBase 1.5.x.
Re-apply original commit with proper commit msg
---
.../java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
index 025dcc8..2245f26 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
@@ -53,7 +53,10 @@ public class IndexedKeyValue extends KeyValue {
public IndexedKeyValue() {}
public IndexedKeyValue(byte[] bs, Mutation mutation) {
-super(mutation.getRow(), 0, mutation.getRow().length);
+this.bytes = mutation.getRow();
+this.offset = 0;
+this.length = mutation.getRow().length;
+
this.indexTableName = new ImmutableBytesPtr(bs);
this.mutation = mutation;
this.hashCode = calcHashCode(indexTableName, mutation);
[phoenix] 01/02: Revert "IndexRebuildTaskIT fails with HBase 1.5.x."
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 4d1f4a2b1d1f5cb2420c31853828136ba8a0014a
Author: Josh Elser
AuthorDate: Wed May 22 13:12:53 2019 -0400
Revert "IndexRebuildTaskIT fails with HBase 1.5.x."
This reverts commit 27a53681cbab108e208bd5051200b69dd9d6398a.
Reverting to reapply with correct commit msg.
---
.../java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
index 2245f26..025dcc8 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
@@ -53,10 +53,7 @@ public class IndexedKeyValue extends KeyValue {
public IndexedKeyValue() {}
public IndexedKeyValue(byte[] bs, Mutation mutation) {
-this.bytes = mutation.getRow();
-this.offset = 0;
-this.length = mutation.getRow().length;
-
+super(mutation.getRow(), 0, mutation.getRow().length);
this.indexTableName = new ImmutableBytesPtr(bs);
this.mutation = mutation;
this.hashCode = calcHashCode(indexTableName, mutation);
[phoenix] branch master updated (27a5368 -> c84beaf)
This is an automated email from the ASF dual-hosted git repository. elserj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git. from 27a5368 IndexRebuildTaskIT fails with HBase 1.5.x. new 4d1f4a2 Revert "IndexRebuildTaskIT fails with HBase 1.5.x." new c84beaf PHOENIX-5289 IndexRebuildTaskIT fails with HBase 1.5.x. The 2 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. Summary of changes:
svn commit: r1857341 - in /phoenix/site: publish/language/datatypes.html publish/language/functions.html publish/language/index.html publish/python.html source/src/site/markdown/python.md
Author: elserj Date: Thu Apr 11 14:34:33 2019 New Revision: 1857341 URL: http://svn.apache.org/viewvc?rev=1857341=rev Log: Correct python driver docs to note that spnego is implemented Modified: phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/python.html phoenix/site/source/src/site/markdown/python.md Modified: phoenix/site/publish/language/datatypes.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1857341=1857340=1857341=diff == --- phoenix/site/publish/language/datatypes.html (original) +++ phoenix/site/publish/language/datatypes.html Thu Apr 11 14:34:33 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/language/functions.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1857341=1857340=1857341=diff == --- phoenix/site/publish/language/functions.html (original) +++ phoenix/site/publish/language/functions.html Thu Apr 11 14:34:33 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1857341=1857340=1857341=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Thu Apr 11 14:34:33 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/python.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/python.html?rev=1857341=1857340=1857341=diff == --- phoenix/site/publish/python.html (original) +++ phoenix/site/publish/python.html Thu Apr 11 14:34:33 2019 @@ -1,7 +1,7 @@ @@ -202,13 +202,14 @@ print(cursor.fetchone()['USERNAME']) Limitations - The driver presently does not support Kerberos authentication https://issues.apache.org/jira/browse/PHOENIX-4688;>PHOENIX-4688 + None presently known. Resources https://issues.apache.org/jira/browse/PHOENIX-4636;>PHOENIX-4636 : Initial landing of the driver into Apache Phoenix. + https://issues.apache.org/jira/browse/PHOENIX-4688;>PHOENIX-4688 : Implementation of Kerberos authentication via SPNEGO. @@ -461,7 +462,7 @@ print(cursor.fetchone()['USERNAME']) Back to top - Copyright 2018 http://www.apache.org;>Apache Software Foundation. All Rights Reserved. + Copyright 2019 http://www.apache.org;>Apache Software Foundation. All Rights Reserved. Modified: phoenix/site/source/src/site/markdown/python.md URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/python.md?rev=1857341=1857340=1857341=diff == --- phoenix/site/source/src/site/markdown/python.md (original) +++ phoenix/site/source/src/site/markdown/python.md Thu Apr 11 14:34:33 2019 @@ -38,7 +38,8 @@ print(cursor.fetchone()['USERNAME']) ``` ## Limitations -* The driver presently does not support Kerberos authentication [PHOENIX-4688](https://issues.apache.org/jira/browse/PHOENIX-4688) +* None presently known. ## Resources * [PHOENIX-4636] (https://issues.apache.org/jira/browse/PHOENIX-4636) : Initial landing of the driver into Apache Phoenix. +* [PHOENIX-4688] (https://issues.apache.org/jira/browse/PHOENIX-4688) : Implementation of Kerberos authentication via SPNEGO.
svn commit: r1856074 - in /phoenix/site: publish/language/datatypes.html publish/language/functions.html publish/language/index.html publish/secondary_indexing.html source/src/site/markdown/secondary_
Author: elserj Date: Fri Mar 22 19:13:57 2019 New Revision: 1856074 URL: http://svn.apache.org/viewvc?rev=1856074=rev Log: PHOENIX-5205 Clarify limitation around incremental loads via CSVBulkLoad w/ mutable 2ndary index Modified: phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/secondary_indexing.html phoenix/site/source/src/site/markdown/secondary_indexing.md Modified: phoenix/site/publish/language/datatypes.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1856074=1856073=1856074=diff == --- phoenix/site/publish/language/datatypes.html (original) +++ phoenix/site/publish/language/datatypes.html Fri Mar 22 19:13:57 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/language/functions.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1856074=1856073=1856074=diff == --- phoenix/site/publish/language/functions.html (original) +++ phoenix/site/publish/language/functions.html Fri Mar 22 19:13:57 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1856074=1856073=1856074=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Fri Mar 22 19:13:57 2019 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/secondary_indexing.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/secondary_indexing.html?rev=1856074=1856073=1856074=diff == --- phoenix/site/publish/secondary_indexing.html (original) +++ phoenix/site/publish/secondary_indexing.html Fri Mar 22 19:13:57 2019 @@ -1,7 +1,7 @@ @@ -338,6 +338,12 @@ CREATE LOCAL INDEX my_index ON my_table phoenix.index.failure.handling.rebuild must be set to false to disable a mutable index from being rebuilt in the background in the event of a commit failure. + + BulkLoad Tool Limitation + The BulkLoadTools (e.g. CSVBulkLoadTool and JSONBulkLoadTool) cannot presently generate correct updates to mutable secondary indexes when pre-existing records are being updated. In the normal mutable secondary index write path, we can safely calculate a Delete (for the old record) and a Put (for the new record) for each secondary index while holding a row-lock to prevent concurrent updates. In the context of a MapReduce job, we cannot effectively execute this same logic because we are specifically doing this âout of bandâ from the HBase RegionServers. As such, while these Tools generate HFiles for the index tables with the proper updates for the data being loaded, any previous index records corresponding to the same record in the table are not deleted. This net-effect of this limitation is: if you use these Tools to re-ingest the same records to an index table, that index table will have duplicate records in it which will result in incorrect query results from that i ndex table. + To perform incremental loads of data using the BulkLoadTools which may update existing records, you must drop and re-create all index tables after the data table is loaded. Re-creating the index with the ASYNC option and using IndexTool to populate and enable that index is likely a must for tables of non-trivial size. + To perform incremental loading of CSV datasets that do not require any manual index intervention, the psql tool can be used in place of the BulkLoadTools. Additionally, a MapReduce job could be written to parse CSV/JSON data and write it directly to Phoenix; although, such a tool is not currently provided by Phoenix for users. + @@ -385,7 +391,7 @@ CREATE LOCAL INDEX my_index ON my_table Upgrading Local Indexes created before 4.8.0 While upgrading the Phoenix to 4.8.0+ version at server remove above three local indexing related configurations from hbase-site.xml if present. From client we are supporting both online(while initializing the connection from phoenix client of 4.8.0+ versions) and offline(using psql tool) upgrade of local indexes created before 4.8.0. As part of upgrade we recreate the local indexes in ASYNC mode. After upgrade user need to build the indexes using http://phoenix.apache.org/secondary_indexing.html#Index_Population;>IndexTool - Following client side configuration used in the upgrade. + Following client side configuration used in the upgrade. phoenix.client.localIndexUpgrade @@ -802,7 +808,7 @@ CREATE LOCAL INDEX my_index ON my_ta
svn commit: r1854545 - in /phoenix/site: publish/language/datatypes.html publish/language/functions.html publish/language/index.html publish/news.html source/src/site/markdown/news.md
Author: elserj Date: Thu Feb 28 19:50:22 2019 New Revision: 1854545 URL: http://svn.apache.org/viewvc?rev=1854545=rev Log: Add a news link to the nosql day blog post Modified: phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/news.html phoenix/site/source/src/site/markdown/news.md Modified: phoenix/site/publish/language/datatypes.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1854545=1854544=1854545=diff == --- phoenix/site/publish/language/datatypes.html (original) +++ phoenix/site/publish/language/datatypes.html Thu Feb 28 19:50:22 2019 @@ -1,7 +1,7 @@ @@ -987,7 +987,7 @@ syntax-end --> Back to top - Copyright 2018 http://www.apache.org;>Apache Software Foundation. All Rights Reserved. + Copyright 2019 http://www.apache.org;>Apache Software Foundation. All Rights Reserved. Modified: phoenix/site/publish/language/functions.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1854545=1854544=1854545=diff == --- phoenix/site/publish/language/functions.html (original) +++ phoenix/site/publish/language/functions.html Thu Feb 28 19:50:22 2019 @@ -1,7 +1,7 @@ @@ -2294,7 +2294,7 @@ syntax-end --> Back to top - Copyright 2018 http://www.apache.org;>Apache Software Foundation. All Rights Reserved. + Copyright 2019 http://www.apache.org;>Apache Software Foundation. All Rights Reserved. Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1854545=1854544=1854545=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Thu Feb 28 19:50:22 2019 @@ -1,7 +1,7 @@ @@ -2086,7 +2086,7 @@ syntax-end --> Back to top - Copyright 2018 http://www.apache.org;>Apache Software Foundation. All Rights Reserved. + Copyright 2019 http://www.apache.org;>Apache Software Foundation. All Rights Reserved. Modified: phoenix/site/publish/news.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/news.html?rev=1854545=1854544=1854545=diff == --- phoenix/site/publish/news.html (original) +++ phoenix/site/publish/news.html Thu Feb 28 19:50:22 2019 @@ -1,7 +1,7 @@ @@ -171,6 +171,10 @@ + https://blogs.apache.org/phoenix/entry/nosql-day-2019;>NoSQL Day 2019 in Washington, DC (February 28, 2019) + + + https://blogs.apache.org/phoenix/entry/apache-phoenix-releases-next-major;>Announcing Phoenix 5.0.0 released (July 4, 2018) @@ -506,7 +510,7 @@ Back to top - Copyright 2018 http://www.apache.org;>Apache Software Foundation. All Rights Reserved. + Copyright 2019 http://www.apache.org;>Apache Software Foundation. All Rights Reserved. Modified: phoenix/site/source/src/site/markdown/news.md URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/news.md?rev=1854545=1854544=1854545=diff == --- phoenix/site/source/src/site/markdown/news.md (original) +++ phoenix/site/source/src/site/markdown/news.md Thu Feb 28 19:50:22 2019 @@ -1,6 +1,8 @@ # Apache Phoenix News + [NoSQL Day 2019 in Washington, DC](https://blogs.apache.org/phoenix/entry/nosql-day-2019) (February 28, 2019) + [Announcing Phoenix 5.0.0 released](https://blogs.apache.org/phoenix/entry/apache-phoenix-releases-next-major) (July 4, 2018) [PhoenixCon 2018 announced for June 18th, 2018](https://phoenix.apache.org/phoenixcon-2018) (March 24, 2018)
svn commit: r1853982 - in /phoenix/site: publish/building_website.html source/src/site/markdown/building_website.md
Author: elserj Date: Wed Feb 20 19:42:32 2019 New Revision: 1853982 URL: http://svn.apache.org/viewvc?rev=1853982=rev Log: Fix incorrect path on building_website Modified: phoenix/site/publish/building_website.html phoenix/site/source/src/site/markdown/building_website.md Modified: phoenix/site/publish/building_website.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building_website.html?rev=1853982=1853981=1853982=diff == --- phoenix/site/publish/building_website.html (original) +++ phoenix/site/publish/building_website.html Wed Feb 20 19:42:32 2019 @@ -1,7 +1,7 @@ @@ -173,7 +173,7 @@ - Edit/Add source markdown files in /src/site/markdown directory. + Edit/Add source markdown files in site/source/src/site/markdown directory. Edit phoenix-docs/src/docsrc/help/phoenix.csv to update Reference pages, adding any missing new words to phoenix-docs/src/tools/org/h2/build/doc/dictionary.txt. Run build.sh located at root to generate/update html web pages in site/publish directory svn commit source markdown files and html web pages @@ -437,7 +437,7 @@ python -m SimpleHTTPServer 8000 Back to top - Copyright 2018 http://www.apache.org;>Apache Software Foundation. All Rights Reserved. + Copyright 2019 http://www.apache.org;>Apache Software Foundation. All Rights Reserved. Modified: phoenix/site/source/src/site/markdown/building_website.md URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/building_website.md?rev=1853982=1853981=1853982=diff == --- phoenix/site/source/src/site/markdown/building_website.md (original) +++ phoenix/site/source/src/site/markdown/building_website.md Wed Feb 20 19:42:32 2019 @@ -6,7 +6,7 @@ $ svn checkout https://svn.apache.org/repos/asf/phoenix ``` -2. Edit/Add source markdown files in `/src/site/markdown` directory. +2. Edit/Add source markdown files in `site/source/src/site/markdown` directory. 2. Edit `phoenix-docs/src/docsrc/help/phoenix.csv` to update Reference pages, adding any missing new words to `phoenix-docs/src/tools/org/h2/build/doc/dictionary.txt`. 3. Run `build.sh` located at root to generate/update html web pages in `site/publish` directory 4. `svn commit` source markdown files and html web pages
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5128 Add ability to skip header in CsvBulkLoadTool
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch 4.x-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push:
new baa7080 PHOENIX-5128 Add ability to skip header in CsvBulkLoadTool
baa7080 is described below
commit baa708063de33c3a0b303f3121dd52ee6247702d
Author: Josh Elser
AuthorDate: Fri Feb 8 11:13:01 2019 -0500
PHOENIX-5128 Add ability to skip header in CsvBulkLoadTool
---
.../apache/phoenix/end2end/CsvBulkLoadToolIT.java | 33
.../phoenix/mapreduce/AbstractBulkLoadTool.java| 9 +-
.../phoenix/mapreduce/PhoenixTextInputFormat.java | 97 ++
3 files changed, 137 insertions(+), 2 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
index 7e4226d..699b469 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
@@ -497,4 +497,37 @@ public class CsvBulkLoadToolIT extends BaseOwnClusterIT {
stmt.close();
}
+
+@Test
+public void testIgnoreCsvHeader() throws Exception {
+try (Statement stmt = conn.createStatement()) {
+stmt.execute("CREATE TABLE S.TABLE13 (ID INTEGER NOT NULL PRIMARY
KEY, NAME VARCHAR)");
+
+final Configuration conf = new
Configuration(getUtility().getConfiguration());
+FileSystem fs = FileSystem.get(getUtility().getConfiguration());
+FSDataOutputStream outputStream = fs.create(new
Path("/tmp/input13.csv"));
+try (PrintWriter printWriter = new PrintWriter(outputStream)) {
+printWriter.println("id,name");
+printWriter.println("1,Name 1");
+printWriter.println("2,Name 2");
+printWriter.println("3,Name 3");
+}
+
+CsvBulkLoadTool csvBulkLoadTool = new CsvBulkLoadTool();
+csvBulkLoadTool.setConf(conf);
+int exitCode = csvBulkLoadTool.run(new String[] {
+"--input", "/tmp/input13.csv",
+"--table", "table13",
+"--schema", "s",
+"--zookeeper", zkQuorum,
+"--skip-header"});
+assertEquals(0, exitCode);
+
+try (ResultSet rs = stmt.executeQuery("SELECT COUNT(1) FROM
S.TABLE13")) {
+assertTrue(rs.next());
+assertEquals(3, rs.getInt(1));
+assertFalse(rs.next());
+}
+}
+}
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index f717647..5252afb 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -47,7 +47,6 @@ import
org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
-import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.apache.hadoop.util.Tool;
import org.apache.phoenix.index.IndexMaintainer;
@@ -91,6 +90,7 @@ public abstract class AbstractBulkLoadTool extends Configured
implements Tool {
static final Option IMPORT_COLUMNS_OPT = new Option("c", "import-columns",
true, "Comma-separated list of columns to be imported");
static final Option IGNORE_ERRORS_OPT = new Option("g", "ignore-errors",
false, "Ignore input errors");
static final Option HELP_OPT = new Option("h", "help", false, "Show this
help and quit");
+static final Option SKIP_HEADER_OPT = new Option("k", "skip-header",
false, "Skip the first line of CSV files (the header)");
/**
* Set configuration values based on parsed command line options.
@@ -114,6 +114,7 @@ public abstract class AbstractBulkLoadTool extends
Configured implements Tool {
options.addOption(IMPORT_COLUMNS_OPT);
options.addOption(IGNORE_ERRORS_OPT);
options.addOption(HELP_OPT);
+options.addOption(SKIP_HEADER_OPT);
return options;
}
@@ -205,6 +206,10 @@ public abstract class AbstractBulkLoadTool extends
Configured implements Tool {
conf.set(entry.getKey(), entry.getValue());
[phoenix] branch master updated: PHOENIX-5128 Add ability to skip header in CsvBulkLoadTool
This is an automated email from the ASF dual-hosted git repository.
elserj 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 20bc741 PHOENIX-5128 Add ability to skip header in CsvBulkLoadTool
20bc741 is described below
commit 20bc74145762d2b19e80b609bec901489accd5cb
Author: Josh Elser
AuthorDate: Fri Feb 8 11:13:01 2019 -0500
PHOENIX-5128 Add ability to skip header in CsvBulkLoadTool
---
.../apache/phoenix/end2end/CsvBulkLoadToolIT.java | 33
.../phoenix/mapreduce/AbstractBulkLoadTool.java| 9 +-
.../phoenix/mapreduce/PhoenixTextInputFormat.java | 97 ++
3 files changed, 137 insertions(+), 2 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
index 7e4226d..699b469 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
@@ -497,4 +497,37 @@ public class CsvBulkLoadToolIT extends BaseOwnClusterIT {
stmt.close();
}
+
+@Test
+public void testIgnoreCsvHeader() throws Exception {
+try (Statement stmt = conn.createStatement()) {
+stmt.execute("CREATE TABLE S.TABLE13 (ID INTEGER NOT NULL PRIMARY
KEY, NAME VARCHAR)");
+
+final Configuration conf = new
Configuration(getUtility().getConfiguration());
+FileSystem fs = FileSystem.get(getUtility().getConfiguration());
+FSDataOutputStream outputStream = fs.create(new
Path("/tmp/input13.csv"));
+try (PrintWriter printWriter = new PrintWriter(outputStream)) {
+printWriter.println("id,name");
+printWriter.println("1,Name 1");
+printWriter.println("2,Name 2");
+printWriter.println("3,Name 3");
+}
+
+CsvBulkLoadTool csvBulkLoadTool = new CsvBulkLoadTool();
+csvBulkLoadTool.setConf(conf);
+int exitCode = csvBulkLoadTool.run(new String[] {
+"--input", "/tmp/input13.csv",
+"--table", "table13",
+"--schema", "s",
+"--zookeeper", zkQuorum,
+"--skip-header"});
+assertEquals(0, exitCode);
+
+try (ResultSet rs = stmt.executeQuery("SELECT COUNT(1) FROM
S.TABLE13")) {
+assertTrue(rs.next());
+assertEquals(3, rs.getInt(1));
+assertFalse(rs.next());
+}
+}
+}
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index 13c7ab6..e321361 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -47,7 +47,6 @@ import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.tool.LoadIncrementalHFiles;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
-import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.apache.hadoop.util.Tool;
import org.apache.phoenix.jdbc.PhoenixConnection;
@@ -88,6 +87,7 @@ public abstract class AbstractBulkLoadTool extends Configured
implements Tool {
static final Option IMPORT_COLUMNS_OPT = new Option("c", "import-columns",
true, "Comma-separated list of columns to be imported");
static final Option IGNORE_ERRORS_OPT = new Option("g", "ignore-errors",
false, "Ignore input errors");
static final Option HELP_OPT = new Option("h", "help", false, "Show this
help and quit");
+static final Option SKIP_HEADER_OPT = new Option("k", "skip-header",
false, "Skip the first line of CSV files (the header)");
/**
* Set configuration values based on parsed command line options.
@@ -111,6 +111,7 @@ public abstract class AbstractBulkLoadTool extends
Configured implements Tool {
options.addOption(IMPORT_COLUMNS_OPT);
options.addOption(IGNORE_ERRORS_OPT);
options.addOption(HELP_OPT);
+options.addOption(SKIP_HEADER_OPT);
return options;
}
@@ -202,6 +203,10 @@ public abstract class AbstractBulkLoadTool extends
Configured implements Tool {
conf.set(entry.getKey(), entry.getValue());
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5128 Add ability to skip header in CsvBulkLoadTool
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch 4.x-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push:
new e1c48a7 PHOENIX-5128 Add ability to skip header in CsvBulkLoadTool
e1c48a7 is described below
commit e1c48a78950d0dd29e6d486f49a3291cd3ac640d
Author: Josh Elser
AuthorDate: Fri Feb 8 11:13:01 2019 -0500
PHOENIX-5128 Add ability to skip header in CsvBulkLoadTool
---
.../apache/phoenix/end2end/CsvBulkLoadToolIT.java | 33
.../phoenix/mapreduce/AbstractBulkLoadTool.java| 9 +-
.../phoenix/mapreduce/PhoenixTextInputFormat.java | 97 ++
3 files changed, 137 insertions(+), 2 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
index 7e4226d..699b469 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
@@ -497,4 +497,37 @@ public class CsvBulkLoadToolIT extends BaseOwnClusterIT {
stmt.close();
}
+
+@Test
+public void testIgnoreCsvHeader() throws Exception {
+try (Statement stmt = conn.createStatement()) {
+stmt.execute("CREATE TABLE S.TABLE13 (ID INTEGER NOT NULL PRIMARY
KEY, NAME VARCHAR)");
+
+final Configuration conf = new
Configuration(getUtility().getConfiguration());
+FileSystem fs = FileSystem.get(getUtility().getConfiguration());
+FSDataOutputStream outputStream = fs.create(new
Path("/tmp/input13.csv"));
+try (PrintWriter printWriter = new PrintWriter(outputStream)) {
+printWriter.println("id,name");
+printWriter.println("1,Name 1");
+printWriter.println("2,Name 2");
+printWriter.println("3,Name 3");
+}
+
+CsvBulkLoadTool csvBulkLoadTool = new CsvBulkLoadTool();
+csvBulkLoadTool.setConf(conf);
+int exitCode = csvBulkLoadTool.run(new String[] {
+"--input", "/tmp/input13.csv",
+"--table", "table13",
+"--schema", "s",
+"--zookeeper", zkQuorum,
+"--skip-header"});
+assertEquals(0, exitCode);
+
+try (ResultSet rs = stmt.executeQuery("SELECT COUNT(1) FROM
S.TABLE13")) {
+assertTrue(rs.next());
+assertEquals(3, rs.getInt(1));
+assertFalse(rs.next());
+}
+}
+}
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index f717647..5252afb 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -47,7 +47,6 @@ import
org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
-import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.apache.hadoop.util.Tool;
import org.apache.phoenix.index.IndexMaintainer;
@@ -91,6 +90,7 @@ public abstract class AbstractBulkLoadTool extends Configured
implements Tool {
static final Option IMPORT_COLUMNS_OPT = new Option("c", "import-columns",
true, "Comma-separated list of columns to be imported");
static final Option IGNORE_ERRORS_OPT = new Option("g", "ignore-errors",
false, "Ignore input errors");
static final Option HELP_OPT = new Option("h", "help", false, "Show this
help and quit");
+static final Option SKIP_HEADER_OPT = new Option("k", "skip-header",
false, "Skip the first line of CSV files (the header)");
/**
* Set configuration values based on parsed command line options.
@@ -114,6 +114,7 @@ public abstract class AbstractBulkLoadTool extends
Configured implements Tool {
options.addOption(IMPORT_COLUMNS_OPT);
options.addOption(IGNORE_ERRORS_OPT);
options.addOption(HELP_OPT);
+options.addOption(SKIP_HEADER_OPT);
return options;
}
@@ -205,6 +206,10 @@ public abstract class AbstractBulkLoadTool extends
Configured implements Tool {
conf.set(entry.getKey(), entry.getValue());
[phoenix] branch 4.x-HBase-1.2 updated: PHOENIX-5128 Add ability to skip header in CsvBulkLoadTool
This is an automated email from the ASF dual-hosted git repository.
elserj pushed a commit to branch 4.x-HBase-1.2
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.2 by this push:
new 552719e PHOENIX-5128 Add ability to skip header in CsvBulkLoadTool
552719e is described below
commit 552719e3113d55ced0e0a62521777e6ffc3adac7
Author: Josh Elser
AuthorDate: Fri Feb 8 11:13:01 2019 -0500
PHOENIX-5128 Add ability to skip header in CsvBulkLoadTool
---
.../apache/phoenix/end2end/CsvBulkLoadToolIT.java | 33
.../phoenix/mapreduce/AbstractBulkLoadTool.java| 9 +-
.../phoenix/mapreduce/PhoenixTextInputFormat.java | 97 ++
3 files changed, 137 insertions(+), 2 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
index 7e4226d..699b469 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
@@ -497,4 +497,37 @@ public class CsvBulkLoadToolIT extends BaseOwnClusterIT {
stmt.close();
}
+
+@Test
+public void testIgnoreCsvHeader() throws Exception {
+try (Statement stmt = conn.createStatement()) {
+stmt.execute("CREATE TABLE S.TABLE13 (ID INTEGER NOT NULL PRIMARY
KEY, NAME VARCHAR)");
+
+final Configuration conf = new
Configuration(getUtility().getConfiguration());
+FileSystem fs = FileSystem.get(getUtility().getConfiguration());
+FSDataOutputStream outputStream = fs.create(new
Path("/tmp/input13.csv"));
+try (PrintWriter printWriter = new PrintWriter(outputStream)) {
+printWriter.println("id,name");
+printWriter.println("1,Name 1");
+printWriter.println("2,Name 2");
+printWriter.println("3,Name 3");
+}
+
+CsvBulkLoadTool csvBulkLoadTool = new CsvBulkLoadTool();
+csvBulkLoadTool.setConf(conf);
+int exitCode = csvBulkLoadTool.run(new String[] {
+"--input", "/tmp/input13.csv",
+"--table", "table13",
+"--schema", "s",
+"--zookeeper", zkQuorum,
+"--skip-header"});
+assertEquals(0, exitCode);
+
+try (ResultSet rs = stmt.executeQuery("SELECT COUNT(1) FROM
S.TABLE13")) {
+assertTrue(rs.next());
+assertEquals(3, rs.getInt(1));
+assertFalse(rs.next());
+}
+}
+}
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index f717647..5252afb 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -47,7 +47,6 @@ import
org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
-import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.apache.hadoop.util.Tool;
import org.apache.phoenix.index.IndexMaintainer;
@@ -91,6 +90,7 @@ public abstract class AbstractBulkLoadTool extends Configured
implements Tool {
static final Option IMPORT_COLUMNS_OPT = new Option("c", "import-columns",
true, "Comma-separated list of columns to be imported");
static final Option IGNORE_ERRORS_OPT = new Option("g", "ignore-errors",
false, "Ignore input errors");
static final Option HELP_OPT = new Option("h", "help", false, "Show this
help and quit");
+static final Option SKIP_HEADER_OPT = new Option("k", "skip-header",
false, "Skip the first line of CSV files (the header)");
/**
* Set configuration values based on parsed command line options.
@@ -114,6 +114,7 @@ public abstract class AbstractBulkLoadTool extends
Configured implements Tool {
options.addOption(IMPORT_COLUMNS_OPT);
options.addOption(IGNORE_ERRORS_OPT);
options.addOption(HELP_OPT);
+options.addOption(SKIP_HEADER_OPT);
return options;
}
@@ -205,6 +206,10 @@ public abstract class AbstractBulkLoadTool extends
Configured implements Tool {
conf.set(entry.getKey(), entry.getValue());
[4/4] phoenix git commit: PHOENIX-5037 Fix maven site reporting warnings on build
PHOENIX-5037 Fix maven site reporting warnings on build Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4346baa5 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4346baa5 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4346baa5 Branch: refs/heads/4.x-HBase-1.2 Commit: 4346baa5b92e10da490e694c2cc8d7d4f71f7567 Parents: 56d1031 Author: Artem Ervits Authored: Wed Nov 28 11:39:29 2018 -0500 Committer: Josh Elser Committed: Wed Nov 28 12:20:55 2018 -0500 -- phoenix-core/pom.xml | 23 +-- phoenix-kafka/pom.xml | 22 -- pom.xml | 26 -- 3 files changed, 41 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4346baa5/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index c3b9a28..7d01893 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -44,7 +44,6 @@ org.apache.maven.plugins maven-site-plugin - 3.2 org.apache.maven.doxia @@ -62,15 +61,6 @@ 1.7 - - - - org.codehaus.mojo - findbugs-maven-plugin -2.5.2 - - - exec-maven-plugin @@ -445,4 +435,17 @@ disruptor + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + org.codehaus.mojo + findbugs-maven-plugin + + + http://git-wip-us.apache.org/repos/asf/phoenix/blob/4346baa5/phoenix-kafka/pom.xml -- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index a1d51e9..b151101 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -326,7 +326,6 @@ org.apache.maven.plugins maven-site-plugin - 3.2 org.apache.maven.doxia @@ -344,15 +343,6 @@ 1.7 - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - - @@ -412,4 +402,16 @@ + + + +org.apache.maven.plugins +maven-project-info-reports-plugin + + +org.codehaus.mojo +findbugs-maven-plugin + + + http://git-wip-us.apache.org/repos/asf/phoenix/blob/4346baa5/pom.xml -- diff --git a/pom.xml b/pom.xml index 9456fc3..d0b55de 100644 --- a/pom.xml +++ b/pom.xml @@ -463,16 +463,7 @@ org.apache.maven.plugins maven-site-plugin -3.2 - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - - +3.7.1 org.apache.rat @@ -1038,4 +1029,19 @@ + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.0.0 + + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.5 + + +
[1/4] phoenix git commit: PHOENIX-5037 Fix maven site reporting warnings on build
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.2 56d1031f8 -> 4346baa5b refs/heads/4.x-HBase-1.3 1f022cbfc -> d6fa69a41 refs/heads/4.x-HBase-1.4 644ab0e6e -> fe8a7798b refs/heads/master 7217568ea -> 179eb5076 PHOENIX-5037 Fix maven site reporting warnings on build Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/179eb507 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/179eb507 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/179eb507 Branch: refs/heads/master Commit: 179eb5076db8dc88c97d92cbdba52c4b6c54c76c Parents: 7217568 Author: Artem Ervits Authored: Wed Nov 28 11:39:29 2018 -0500 Committer: Josh Elser Committed: Wed Nov 28 11:43:25 2018 -0500 -- phoenix-core/pom.xml | 23 +-- phoenix-kafka/pom.xml | 22 -- pom.xml | 26 -- 3 files changed, 41 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/179eb507/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index f9718ea..6919385 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -44,7 +44,6 @@ org.apache.maven.plugins maven-site-plugin - 3.2 org.apache.maven.doxia @@ -62,15 +61,6 @@ 1.7 - - - - org.codehaus.mojo - findbugs-maven-plugin -2.5.2 - - - exec-maven-plugin @@ -474,4 +464,17 @@ disruptor + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + org.codehaus.mojo + findbugs-maven-plugin + + + http://git-wip-us.apache.org/repos/asf/phoenix/blob/179eb507/phoenix-kafka/pom.xml -- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index cde8b8b..6c0a229 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -330,7 +330,6 @@ org.apache.maven.plugins maven-site-plugin - 3.2 org.apache.maven.doxia @@ -348,15 +347,6 @@ 1.7 - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - - @@ -416,4 +406,16 @@ + + + +org.apache.maven.plugins +maven-project-info-reports-plugin + + +org.codehaus.mojo +findbugs-maven-plugin + + + http://git-wip-us.apache.org/repos/asf/phoenix/blob/179eb507/pom.xml -- diff --git a/pom.xml b/pom.xml index 16ec530..571aa5c 100644 --- a/pom.xml +++ b/pom.xml @@ -460,16 +460,7 @@ org.apache.maven.plugins maven-site-plugin -3.2 - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - - +3.7.1 org.apache.rat @@ -1068,4 +1059,19 @@ + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.0.0 + + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.5 + + +
[3/4] phoenix git commit: PHOENIX-5037 Fix maven site reporting warnings on build
PHOENIX-5037 Fix maven site reporting warnings on build Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d6fa69a4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d6fa69a4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d6fa69a4 Branch: refs/heads/4.x-HBase-1.3 Commit: d6fa69a41179e99880c36f52eb007d7bd6d8f6bc Parents: 1f022cb Author: Artem Ervits Authored: Wed Nov 28 11:39:29 2018 -0500 Committer: Josh Elser Committed: Wed Nov 28 12:08:22 2018 -0500 -- phoenix-core/pom.xml | 23 +-- phoenix-kafka/pom.xml | 22 -- pom.xml | 26 -- 3 files changed, 41 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6fa69a4/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 3a32407..813326d 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -44,7 +44,6 @@ org.apache.maven.plugins maven-site-plugin - 3.2 org.apache.maven.doxia @@ -62,15 +61,6 @@ 1.7 - - - - org.codehaus.mojo - findbugs-maven-plugin -2.5.2 - - - exec-maven-plugin @@ -445,4 +435,17 @@ disruptor + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + org.codehaus.mojo + findbugs-maven-plugin + + + http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6fa69a4/phoenix-kafka/pom.xml -- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index 4584d24..0faa499 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -326,7 +326,6 @@ org.apache.maven.plugins maven-site-plugin - 3.2 org.apache.maven.doxia @@ -344,15 +343,6 @@ 1.7 - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - - @@ -412,4 +402,16 @@ + + + +org.apache.maven.plugins +maven-project-info-reports-plugin + + +org.codehaus.mojo +findbugs-maven-plugin + + + http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6fa69a4/pom.xml -- diff --git a/pom.xml b/pom.xml index f2c2f20..c8d67fd 100644 --- a/pom.xml +++ b/pom.xml @@ -463,16 +463,7 @@ org.apache.maven.plugins maven-site-plugin -3.2 - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - - +3.7.1 org.apache.rat @@ -1038,4 +1029,19 @@ + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.0.0 + + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.5 + + +
[2/4] phoenix git commit: PHOENIX-5037 Fix maven site reporting warnings on build
PHOENIX-5037 Fix maven site reporting warnings on build Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fe8a7798 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fe8a7798 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fe8a7798 Branch: refs/heads/4.x-HBase-1.4 Commit: fe8a7798b70105b216b800ba50d5ebf308d285a7 Parents: 644ab0e Author: Artem Ervits Authored: Wed Nov 28 11:39:29 2018 -0500 Committer: Josh Elser Committed: Wed Nov 28 12:03:56 2018 -0500 -- phoenix-core/pom.xml | 23 +-- phoenix-kafka/pom.xml | 22 -- pom.xml | 26 -- 3 files changed, 41 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe8a7798/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 3416b18..dcedd54 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -44,7 +44,6 @@ org.apache.maven.plugins maven-site-plugin - 3.2 org.apache.maven.doxia @@ -62,15 +61,6 @@ 1.7 - - - - org.codehaus.mojo - findbugs-maven-plugin -2.5.2 - - - exec-maven-plugin @@ -445,4 +435,17 @@ disruptor + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + org.codehaus.mojo + findbugs-maven-plugin + + + http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe8a7798/phoenix-kafka/pom.xml -- diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index b104cfb..86dbb59 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -326,7 +326,6 @@ org.apache.maven.plugins maven-site-plugin - 3.2 org.apache.maven.doxia @@ -344,15 +343,6 @@ 1.7 - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - - @@ -412,4 +402,16 @@ + + + +org.apache.maven.plugins +maven-project-info-reports-plugin + + +org.codehaus.mojo +findbugs-maven-plugin + + + http://git-wip-us.apache.org/repos/asf/phoenix/blob/fe8a7798/pom.xml -- diff --git a/pom.xml b/pom.xml index 0f0b4f0..615f425 100644 --- a/pom.xml +++ b/pom.xml @@ -463,16 +463,7 @@ org.apache.maven.plugins maven-site-plugin -3.2 - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - - - +3.7.1 org.apache.rat @@ -1038,4 +1029,19 @@ + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.0.0 + + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.5 + + +
[8/8] phoenix git commit: PHOENIX-5038 Use a single version of Scala in phoenix-spark
PHOENIX-5038 Use a single version of Scala in phoenix-spark
Signed-off-by: Josh Elser
Signed-off-by: Thomas D'Silva
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/56d1031f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/56d1031f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/56d1031f
Branch: refs/heads/4.x-HBase-1.2
Commit: 56d1031f8f3490e83e320aeb3679e36f9ecf61f2
Parents: ab51173
Author: Artem Ervits
Authored: Wed Nov 28 11:11:18 2018 -0500
Committer: Josh Elser
Committed: Wed Nov 28 11:30:41 2018 -0500
--
phoenix-spark/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/56d1031f/phoenix-spark/pom.xml
--
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index cbf3808..3081dc3 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -503,13 +503,14 @@
net.alchim31.maven
scala-maven-plugin
-3.2.0
+3.4.4
${project.build.sourceEncoding}
-Xmx1024m
${scala.version}
+ ${scala.binary.version}
[2/8] phoenix git commit: PHOENIX-5038 Use a single version of Scala in phoenix-spark
PHOENIX-5038 Use a single version of Scala in phoenix-spark
Signed-off-by: Josh Elser
Signed-off-by: Thomas D'Silva
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7217568e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7217568e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7217568e
Branch: refs/heads/master
Commit: 7217568ead0e08fba07e65d2f4bf2f68f043ea44
Parents: 8cf6fd2
Author: Artem Ervits
Authored: Wed Nov 28 11:11:18 2018 -0500
Committer: Josh Elser
Committed: Wed Nov 28 11:18:48 2018 -0500
--
phoenix-spark/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7217568e/phoenix-spark/pom.xml
--
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index ea2ceae..db511b5 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -512,13 +512,14 @@
net.alchim31.maven
scala-maven-plugin
-3.2.0
+3.4.4
${project.build.sourceEncoding}
-Xmx1024m
${scala.version}
+ ${scala.binary.version}
[6/8] phoenix git commit: PHOENIX-5038 Use a single version of Scala in phoenix-spark
PHOENIX-5038 Use a single version of Scala in phoenix-spark
Signed-off-by: Josh Elser
Signed-off-by: Thomas D'Silva
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1f022cbf
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1f022cbf
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1f022cbf
Branch: refs/heads/4.x-HBase-1.3
Commit: 1f022cbfcc3edad22c4b10f6f0cefe02d27fc936
Parents: 9dc4015
Author: Artem Ervits
Authored: Wed Nov 28 11:11:18 2018 -0500
Committer: Josh Elser
Committed: Wed Nov 28 11:26:39 2018 -0500
--
phoenix-spark/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1f022cbf/phoenix-spark/pom.xml
--
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index d3979f4..6e2d815 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -503,13 +503,14 @@
net.alchim31.maven
scala-maven-plugin
-3.2.0
+3.4.4
${project.build.sourceEncoding}
-Xmx1024m
${scala.version}
+ ${scala.binary.version}
[1/8] phoenix git commit: PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.2 93e284647 -> 56d1031f8 refs/heads/4.x-HBase-1.3 1813af615 -> 1f022cbfc refs/heads/4.x-HBase-1.4 d0a115ce0 -> 644ab0e6e refs/heads/master 70d5cd9e3 -> 7217568ea PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8cf6fd2a Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8cf6fd2a Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8cf6fd2a Branch: refs/heads/master Commit: 8cf6fd2a0499b135d42b2bf39926ca1141699508 Parents: 70d5cd9 Author: Artem Ervits Authored: Wed Nov 28 11:00:20 2018 -0500 Committer: Josh Elser Committed: Wed Nov 28 11:01:28 2018 -0500 -- phoenix-pherf/pom.xml | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/8cf6fd2a/phoenix-pherf/pom.xml -- diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index b5880f1..6456ace 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -111,11 +111,6 @@ test - junit - junit - test - - org.mockito mockito-all test
[7/8] phoenix git commit: PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf
PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ab51173d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ab51173d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ab51173d Branch: refs/heads/4.x-HBase-1.2 Commit: ab51173dc9de1057c7c72f10acc12f87e28a150c Parents: 93e2846 Author: Artem Ervits Authored: Wed Nov 28 11:00:20 2018 -0500 Committer: Josh Elser Committed: Wed Nov 28 11:30:38 2018 -0500 -- --
[3/8] phoenix git commit: PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf
PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2eff637e Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2eff637e Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2eff637e Branch: refs/heads/4.x-HBase-1.4 Commit: 2eff637e0aef843a5258b753c5985c2ee12b359e Parents: d0a115c Author: Artem Ervits Authored: Wed Nov 28 11:00:20 2018 -0500 Committer: Josh Elser Committed: Wed Nov 28 11:19:56 2018 -0500 -- --
[4/8] phoenix git commit: PHOENIX-5038 Use a single version of Scala in phoenix-spark
PHOENIX-5038 Use a single version of Scala in phoenix-spark
Signed-off-by: Josh Elser
Signed-off-by: Thomas D'Silva
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/644ab0e6
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/644ab0e6
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/644ab0e6
Branch: refs/heads/4.x-HBase-1.4
Commit: 644ab0e6ecb9dea0adfa351f342c5b70759adc9f
Parents: 2eff637
Author: Artem Ervits
Authored: Wed Nov 28 11:11:18 2018 -0500
Committer: Josh Elser
Committed: Wed Nov 28 11:20:03 2018 -0500
--
phoenix-spark/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/644ab0e6/phoenix-spark/pom.xml
--
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index 8c8f50b..46231ee 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -503,13 +503,14 @@
net.alchim31.maven
scala-maven-plugin
-3.2.0
+3.4.4
${project.build.sourceEncoding}
-Xmx1024m
${scala.version}
+ ${scala.binary.version}
[5/8] phoenix git commit: PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf
PHOENIX-5036 Removes the duplicate junit dependency from phoenix-pherf Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9dc40151 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9dc40151 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9dc40151 Branch: refs/heads/4.x-HBase-1.3 Commit: 9dc40151cb941038c53fedd6f828fa279c03c31f Parents: 1813af6 Author: Artem Ervits Authored: Wed Nov 28 11:00:20 2018 -0500 Committer: Josh Elser Committed: Wed Nov 28 11:26:36 2018 -0500 -- --
[2/4] phoenix git commit: PHOENIX-4909 Missing the phoenix-loadbalancer module dependency in phoenix-assembly/pom.xml
PHOENIX-4909 Missing the phoenix-loadbalancer module dependency in
phoenix-assembly/pom.xml
Closes #352
Signed-off-by: Josh Elser
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e8ea05fa
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e8ea05fa
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e8ea05fa
Branch: refs/heads/4.x-HBase-1.4
Commit: e8ea05fabff5315796e3ebd9b5834b30ec2f3918
Parents: 214f72a
Author: Vitaliy
Authored: Wed Sep 19 01:09:01 2018 +0300
Committer: Josh Elser
Committed: Wed Oct 31 12:09:43 2018 -0400
--
bin/phoenix_utils.py | 2 ++
phoenix-assembly/pom.xml | 4
phoenix-assembly/src/build/components/all-common-jars.xml | 8
3 files changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e8ea05fa/bin/phoenix_utils.py
--
diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py
index aa04a5b..98a0896 100755
--- a/bin/phoenix_utils.py
+++ b/bin/phoenix_utils.py
@@ -166,6 +166,8 @@ def setPath():
global phoenix_loadbalancer_jar
phoenix_loadbalancer_jar = find(PHOENIX_LOADBALANCER_JAR_PATTERN,
os.path.join(current_dir, "..", "phoenix-loadbalancer", "target", "*"))
if phoenix_loadbalancer_jar == "":
+phoenix_loadbalancer_jar =
findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN,
os.path.join(current_dir, "..", "lib"))
+if phoenix_loadbalancer_jar == "":
phoenix_loadbalancer_jar =
findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN,
os.path.join(current_dir, ".."))
global phoenix_traceserver_jar
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e8ea05fa/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 9850420..06f3e72 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -126,5 +126,9 @@
org.apache.phoenix
phoenix-queryserver-client
+
+ org.apache.phoenix
+ phoenix-load-balancer
+
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e8ea05fa/phoenix-assembly/src/build/components/all-common-jars.xml
--
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml
b/phoenix-assembly/src/build/components/all-common-jars.xml
index 3d27b26..08ca29a 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -158,5 +158,13 @@
0644
+
+
${project.basedir}/../phoenix-load-balancer/target/
+ lib
+
+phoenix-*.jar
+
+ 0644
+
[1/4] phoenix git commit: PHOENIX-4909 Missing the phoenix-loadbalancer module dependency in phoenix-assembly/pom.xml
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.2 ceff81708 -> ef0ea6ad6
refs/heads/4.x-HBase-1.3 c936d8151 -> fc35ccecc
refs/heads/4.x-HBase-1.4 214f72a56 -> e8ea05fab
refs/heads/master fc550666d -> 59a7dd138
PHOENIX-4909 Missing the phoenix-loadbalancer module dependency in
phoenix-assembly/pom.xml
Closes #352
Signed-off-by: Josh Elser
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/59a7dd13
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/59a7dd13
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/59a7dd13
Branch: refs/heads/master
Commit: 59a7dd138c661c743d58421776cb5e731e1cda99
Parents: fc55066
Author: Vitaliy
Authored: Wed Sep 19 01:09:01 2018 +0300
Committer: Josh Elser
Committed: Wed Oct 31 12:09:08 2018 -0400
--
bin/phoenix_utils.py | 2 ++
phoenix-assembly/pom.xml | 4
phoenix-assembly/src/build/components/all-common-jars.xml | 8
3 files changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/59a7dd13/bin/phoenix_utils.py
--
diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py
index aa04a5b..98a0896 100755
--- a/bin/phoenix_utils.py
+++ b/bin/phoenix_utils.py
@@ -166,6 +166,8 @@ def setPath():
global phoenix_loadbalancer_jar
phoenix_loadbalancer_jar = find(PHOENIX_LOADBALANCER_JAR_PATTERN,
os.path.join(current_dir, "..", "phoenix-loadbalancer", "target", "*"))
if phoenix_loadbalancer_jar == "":
+phoenix_loadbalancer_jar =
findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN,
os.path.join(current_dir, "..", "lib"))
+if phoenix_loadbalancer_jar == "":
phoenix_loadbalancer_jar =
findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN,
os.path.join(current_dir, ".."))
global phoenix_traceserver_jar
http://git-wip-us.apache.org/repos/asf/phoenix/blob/59a7dd13/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 5cbe55f..d143d93 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -126,5 +126,9 @@
org.apache.phoenix
phoenix-queryserver-client
+
+ org.apache.phoenix
+ phoenix-load-balancer
+
http://git-wip-us.apache.org/repos/asf/phoenix/blob/59a7dd13/phoenix-assembly/src/build/components/all-common-jars.xml
--
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml
b/phoenix-assembly/src/build/components/all-common-jars.xml
index 3d27b26..08ca29a 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -158,5 +158,13 @@
0644
+
+
${project.basedir}/../phoenix-load-balancer/target/
+ lib
+
+phoenix-*.jar
+
+ 0644
+
[4/4] phoenix git commit: PHOENIX-4909 Missing the phoenix-loadbalancer module dependency in phoenix-assembly/pom.xml
PHOENIX-4909 Missing the phoenix-loadbalancer module dependency in
phoenix-assembly/pom.xml
Closes #352
Signed-off-by: Josh Elser
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ef0ea6ad
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ef0ea6ad
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ef0ea6ad
Branch: refs/heads/4.x-HBase-1.2
Commit: ef0ea6ad62638652d7074cd87c61f918162e8ecd
Parents: ceff817
Author: Vitaliy
Authored: Wed Sep 19 01:09:01 2018 +0300
Committer: Josh Elser
Committed: Wed Oct 31 12:30:27 2018 -0400
--
bin/phoenix_utils.py | 2 ++
phoenix-assembly/pom.xml | 4
phoenix-assembly/src/build/components/all-common-jars.xml | 8
3 files changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ef0ea6ad/bin/phoenix_utils.py
--
diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py
index aa04a5b..98a0896 100755
--- a/bin/phoenix_utils.py
+++ b/bin/phoenix_utils.py
@@ -166,6 +166,8 @@ def setPath():
global phoenix_loadbalancer_jar
phoenix_loadbalancer_jar = find(PHOENIX_LOADBALANCER_JAR_PATTERN,
os.path.join(current_dir, "..", "phoenix-loadbalancer", "target", "*"))
if phoenix_loadbalancer_jar == "":
+phoenix_loadbalancer_jar =
findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN,
os.path.join(current_dir, "..", "lib"))
+if phoenix_loadbalancer_jar == "":
phoenix_loadbalancer_jar =
findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN,
os.path.join(current_dir, ".."))
global phoenix_traceserver_jar
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ef0ea6ad/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index b08a8a9..1666ff0 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -126,5 +126,9 @@
org.apache.phoenix
phoenix-queryserver-client
+
+ org.apache.phoenix
+ phoenix-load-balancer
+
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ef0ea6ad/phoenix-assembly/src/build/components/all-common-jars.xml
--
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml
b/phoenix-assembly/src/build/components/all-common-jars.xml
index 3d27b26..08ca29a 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -158,5 +158,13 @@
0644
+
+
${project.basedir}/../phoenix-load-balancer/target/
+ lib
+
+phoenix-*.jar
+
+ 0644
+
[3/4] phoenix git commit: PHOENIX-4909 Missing the phoenix-loadbalancer module dependency in phoenix-assembly/pom.xml
PHOENIX-4909 Missing the phoenix-loadbalancer module dependency in
phoenix-assembly/pom.xml
Closes #352
Signed-off-by: Josh Elser
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fc35ccec
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fc35ccec
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fc35ccec
Branch: refs/heads/4.x-HBase-1.3
Commit: fc35ccecc6fa497da506aff48d601657e41d2a70
Parents: c936d81
Author: Vitaliy
Authored: Wed Sep 19 01:09:01 2018 +0300
Committer: Josh Elser
Committed: Wed Oct 31 12:20:52 2018 -0400
--
bin/phoenix_utils.py | 2 ++
phoenix-assembly/pom.xml | 4
phoenix-assembly/src/build/components/all-common-jars.xml | 8
3 files changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/fc35ccec/bin/phoenix_utils.py
--
diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py
index aa04a5b..98a0896 100755
--- a/bin/phoenix_utils.py
+++ b/bin/phoenix_utils.py
@@ -166,6 +166,8 @@ def setPath():
global phoenix_loadbalancer_jar
phoenix_loadbalancer_jar = find(PHOENIX_LOADBALANCER_JAR_PATTERN,
os.path.join(current_dir, "..", "phoenix-loadbalancer", "target", "*"))
if phoenix_loadbalancer_jar == "":
+phoenix_loadbalancer_jar =
findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN,
os.path.join(current_dir, "..", "lib"))
+if phoenix_loadbalancer_jar == "":
phoenix_loadbalancer_jar =
findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN,
os.path.join(current_dir, ".."))
global phoenix_traceserver_jar
http://git-wip-us.apache.org/repos/asf/phoenix/blob/fc35ccec/phoenix-assembly/pom.xml
--
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index f11645a..e41d7e6 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -126,5 +126,9 @@
org.apache.phoenix
phoenix-queryserver-client
+
+ org.apache.phoenix
+ phoenix-load-balancer
+
http://git-wip-us.apache.org/repos/asf/phoenix/blob/fc35ccec/phoenix-assembly/src/build/components/all-common-jars.xml
--
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml
b/phoenix-assembly/src/build/components/all-common-jars.xml
index 3d27b26..08ca29a 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -158,5 +158,13 @@
0644
+
+
${project.basedir}/../phoenix-load-balancer/target/
+ lib
+
+phoenix-*.jar
+
+ 0644
+
[26/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e62be9c8/python/phoenixdb/phoenixdb/avatica/proto/common_pb2.py
--
diff --git a/python/phoenixdb/phoenixdb/avatica/proto/common_pb2.py
b/python/phoenixdb/phoenixdb/avatica/proto/common_pb2.py
new file mode 100644
index 000..3c99502
--- /dev/null
+++ b/python/phoenixdb/phoenixdb/avatica/proto/common_pb2.py
@@ -0,0 +1,1667 @@
+# Generated by the protocol buffer compiler. DO NOT EDIT!
+# source: common.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf.internal import enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf import descriptor_pb2
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+ name='common.proto',
+ package='',
+ syntax='proto3',
+
serialized_pb=_b('\n\x0c\x63ommon.proto\"\xc0\x01\n\x14\x43onnectionProperties\x12\x10\n\x08is_dirty\x18\x01
\x01(\x08\x12\x13\n\x0b\x61uto_commit\x18\x02
\x01(\x08\x12\x17\n\x0fhas_auto_commit\x18\x07
\x01(\x08\x12\x11\n\tread_only\x18\x03
\x01(\x08\x12\x15\n\rhas_read_only\x18\x08
\x01(\x08\x12\x1d\n\x15transaction_isolation\x18\x04
\x01(\r\x12\x0f\n\x07\x63\x61talog\x18\x05 \x01(\t\x12\x0e\n\x06schema\x18\x06
\x01(\t\"S\n\x0fStatementHandle\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\n\n\x02id\x18\x02 \x01(\r\x12\x1d\n\tsignature\x18\x03
\x01(\x0b\x32\n.Signature\"\xb0\x01\n\tSignature\x12 \n\x07\x63olumns\x18\x01
\x03(\x0b\x32\x0f.ColumnMetaData\x12\x0b\n\x03sql\x18\x02
\x01(\t\x12%\n\nparameters\x18\x03
\x03(\x0b\x32\x11.AvaticaParameter\x12&\n\x0e\x63ursor_factory\x18\x04
\x01(\x0b\x32\x0e.CursorFactory\x12%\n\rstatementType\x18\x05
\x01(\x0e\x32\x0e.StatementType\"\xad\x03\n\x0e\x43olumnMetaData\x12\x0f\n\x07ordinal\x18\x01
\x01(\r\x12\x16\n\x0e\x61uto_increment\x18\x02 \x
01(\x08\x12\x16\n\x0e\x63\x61se_sensitive\x18\x03
\x01(\x08\x12\x12\n\nsearchable\x18\x04
\x01(\x08\x12\x10\n\x08\x63urrency\x18\x05
\x01(\x08\x12\x10\n\x08nullable\x18\x06 \x01(\r\x12\x0e\n\x06signed\x18\x07
\x01(\x08\x12\x14\n\x0c\x64isplay_size\x18\x08 \x01(\r\x12\r\n\x05label\x18\t
\x01(\t\x12\x13\n\x0b\x63olumn_name\x18\n
\x01(\t\x12\x13\n\x0bschema_name\x18\x0b \x01(\t\x12\x11\n\tprecision\x18\x0c
\x01(\r\x12\r\n\x05scale\x18\r \x01(\r\x12\x12\n\ntable_name\x18\x0e
\x01(\t\x12\x14\n\x0c\x63\x61talog_name\x18\x0f
\x01(\t\x12\x11\n\tread_only\x18\x10 \x01(\x08\x12\x10\n\x08writable\x18\x11
\x01(\x08\x12\x1b\n\x13\x64\x65\x66initely_writable\x18\x12
\x01(\x08\x12\x19\n\x11\x63olumn_class_name\x18\x13
\x01(\t\x12\x1a\n\x04type\x18\x14
\x01(\x0b\x32\x0c.AvaticaType\"}\n\x0b\x41vaticaType\x12\n\n\x02id\x18\x01
\x01(\r\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x11\n\x03rep\x18\x03
\x01(\x0e\x32\x04.Rep\x12 \n\x07\x63olumns\x18\x04
\x03(\x0b\x32\x0f.ColumnMetaData\x12\x1f\n\tcomponent\x18
\x05
\x01(\x0b\x32\x0c.AvaticaType\"\x91\x01\n\x10\x41vaticaParameter\x12\x0e\n\x06signed\x18\x01
\x01(\x08\x12\x11\n\tprecision\x18\x02 \x01(\r\x12\r\n\x05scale\x18\x03
\x01(\r\x12\x16\n\x0eparameter_type\x18\x04
\x01(\r\x12\x11\n\ttype_name\x18\x05 \x01(\t\x12\x12\n\nclass_name\x18\x06
\x01(\t\x12\x0c\n\x04name\x18\x07
\x01(\t\"\xb3\x01\n\rCursorFactory\x12#\n\x05style\x18\x01
\x01(\x0e\x32\x14.CursorFactory.Style\x12\x12\n\nclass_name\x18\x02
\x01(\t\x12\x13\n\x0b\x66ield_names\x18\x03
\x03(\t\"T\n\x05Style\x12\n\n\x06OBJECT\x10\x00\x12\n\n\x06RECORD\x10\x01\x12\x15\n\x11RECORD_PROJECTION\x10\x02\x12\t\n\x05\x41RRAY\x10\x03\x12\x08\n\x04LIST\x10\x04\x12\x07\n\x03MAP\x10\x05\"9\n\x05\x46rame\x12\x0e\n\x06offset\x18\x01
\x01(\x04\x12\x0c\n\x04\x64one\x18\x02 \x01(\x08\x12\x12\n\x04rows\x18\x03
\x03(\x0b\x32\x04.Row\"\"\n\x03Row\x12\x1b\n\x05value\x18\x01
\x03(\x0b\x32\x0c.ColumnValue\"3\n\x10\x44\x61tabaseProperty\x12\x0c\n\x04name\x18\x01
\x01(\t\x12\x11\n\tfunctions\x18\x02 \x03(
\t\"4\n\x0bWireMessage\x12\x0c\n\x04name\x18\x01
\x01(\t\x12\x17\n\x0fwrapped_message\x18\x02
\x01(\x0c\"\x87\x01\n\x0b\x43olumnValue\x12\x1a\n\x05value\x18\x01
\x03(\x0b\x32\x0b.TypedValue\x12 \n\x0b\x61rray_value\x18\x02
\x03(\x0b\x32\x0b.TypedValue\x12\x17\n\x0fhas_array_value\x18\x03
\x01(\x08\x12!\n\x0cscalar_value\x18\x04
\x01(\x0b\x32\x0b.TypedValue\"\xf2\x01\n\nTypedValue\x12\x12\n\x04type\x18\x01
\x01(\x0e\x32\x04.Rep\x12\x12\n\nbool_value\x18\x02
\x01(\x08\x12\x14\n\x0cstring_value\x18\x03
\x01(\t\x12\x14\n\x0cnumber_value\x18\x04
\x01(\x12\x12\x13\n\x0b\x62ytes_value\x18\x05
\x01(\x0c\x12\x14\n\x0c\x64ouble_value\x18\x06
\x01(\x01\x12\x0c\n\x04null\x18\x07 \x01(\x08\x12 \n\x0b\x61rray_value\x18\x08
\x03(\x0b\x32\x0b.TypedValue\x12\x1c\n\x0e\x63omponent_type\x18\t
[32/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ec3542d6/python/phoenixdb/types.py
--
diff --git a/python/phoenixdb/types.py b/python/phoenixdb/types.py
deleted file mode 100644
index f41355a..000
--- a/python/phoenixdb/types.py
+++ /dev/null
@@ -1,202 +0,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.
-
-import sys
-import time
-import datetime
-from decimal import Decimal
-from phoenixdb.avatica.proto import common_pb2
-
-__all__ = [
-'Date', 'Time', 'Timestamp', 'DateFromTicks', 'TimeFromTicks',
'TimestampFromTicks',
-'Binary', 'STRING', 'BINARY', 'NUMBER', 'DATETIME', 'ROWID', 'BOOLEAN',
-'JAVA_CLASSES', 'JAVA_CLASSES_MAP', 'TypeHelper',
-]
-
-
-def Date(year, month, day):
-"""Constructs an object holding a date value."""
-return datetime.date(year, month, day)
-
-
-def Time(hour, minute, second):
-"""Constructs an object holding a time value."""
-return datetime.time(hour, minute, second)
-
-
-def Timestamp(year, month, day, hour, minute, second):
-"""Constructs an object holding a datetime/timestamp value."""
-return datetime.datetime(year, month, day, hour, minute, second)
-
-
-def DateFromTicks(ticks):
-"""Constructs an object holding a date value from the given UNIX
timestamp."""
-return Date(*time.localtime(ticks)[:3])
-
-
-def TimeFromTicks(ticks):
-"""Constructs an object holding a time value from the given UNIX
timestamp."""
-return Time(*time.localtime(ticks)[3:6])
-
-
-def TimestampFromTicks(ticks):
-"""Constructs an object holding a datetime/timestamp value from the given
UNIX timestamp."""
-return Timestamp(*time.localtime(ticks)[:6])
-
-
-def Binary(value):
-"""Constructs an object capable of holding a binary (long) string value."""
-return bytes(value)
-
-
-def time_from_java_sql_time(n):
-dt = datetime.datetime(1970, 1, 1) + datetime.timedelta(milliseconds=n)
-return dt.time()
-
-
-def time_to_java_sql_time(t):
-return ((t.hour * 60 + t.minute) * 60 + t.second) * 1000 + t.microsecond
// 1000
-
-
-def date_from_java_sql_date(n):
-return datetime.date(1970, 1, 1) + datetime.timedelta(days=n)
-
-
-def date_to_java_sql_date(d):
-if isinstance(d, datetime.datetime):
-d = d.date()
-td = d - datetime.date(1970, 1, 1)
-return td.days
-
-
-def datetime_from_java_sql_timestamp(n):
-return datetime.datetime(1970, 1, 1) + datetime.timedelta(milliseconds=n)
-
-
-def datetime_to_java_sql_timestamp(d):
-td = d - datetime.datetime(1970, 1, 1)
-return td.microseconds // 1000 + (td.seconds + td.days * 24 * 3600) * 1000
-
-
-class ColumnType(object):
-
-def __init__(self, eq_types):
-self.eq_types = tuple(eq_types)
-self.eq_types_set = set(eq_types)
-
-def __eq__(self, other):
-return other in self.eq_types_set
-
-def __cmp__(self, other):
-if other in self.eq_types_set:
-return 0
-if other < self.eq_types:
-return 1
-else:
-return -1
-
-
-STRING = ColumnType(['VARCHAR', 'CHAR'])
-"""Type object that can be used to describe string-based columns."""
-
-BINARY = ColumnType(['BINARY', 'VARBINARY'])
-"""Type object that can be used to describe (long) binary columns."""
-
-NUMBER = ColumnType([
-'INTEGER', 'UNSIGNED_INT', 'BIGINT', 'UNSIGNED_LONG', 'TINYINT',
'UNSIGNED_TINYINT',
-'SMALLINT', 'UNSIGNED_SMALLINT', 'FLOAT', 'UNSIGNED_FLOAT', 'DOUBLE',
'UNSIGNED_DOUBLE', 'DECIMAL'
-])
-"""Type object that can be used to describe numeric columns."""
-
-DATETIME = ColumnType(['TIME', 'DATE', 'TIMESTAMP', 'UNSIGNED_TIME',
'UNSIGNED_DATE', 'UNSIGNED_TIMESTAMP'])
-"""Type object that can be used to describe date/time columns."""
-
-ROWID = ColumnType([])
-"""Only implemented for DB API 2.0 compatibility, not used."""
-
-BOOLEAN = ColumnType(['BOOLEAN'])
-"""Type object that can be used to describe boolean columns. This is a
phoenixdb-specific extension."""
-
-
-# XXX ARRAY
-
-if sys.version_info[0] < 3:
-_long = long # noqa: F821
-else:
-_long = int
-
-JAVA_CLASSES = {
-'bool_value': [
-('java.lang.Boolean', common_pb2.BOOLEAN, None, None),
-],
-
[30/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos Includes updated L for requests-kerberos. Tries to detect when the host system doesn't have necessary dependencies to run the test Closes #344 Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e62be9c8 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e62be9c8 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e62be9c8 Branch: refs/heads/4.x-HBase-1.3 Commit: e62be9c820aaf05266500cc509d4a89658cb6918 Parents: e4d170c Author: Lev Bronshtein Authored: Wed Aug 29 17:19:51 2018 -0400 Committer: Josh Elser Committed: Fri Oct 5 18:41:18 2018 -0400 -- LICENSE | 18 + NOTICE |2 + dev/release_files/LICENSE | 18 + dev/release_files/NOTICE|4 + .../src/it/bin/test_phoenixdb.py| 39 + .../src/it/bin/test_phoenixdb.sh| 79 + .../end2end/SecureQueryServerPhoenixDBIT.java | 424 + pom.xml | 14 +- python/NEWS.rst | 44 - python/README.md| 93 + python/README.rst | 136 -- python/RELEASING.rst| 12 - python/ci/build-env/Dockerfile |7 - python/ci/phoenix/Dockerfile| 33 - python/ci/phoenix/docker-entrypoint.sh | 24 - python/ci/phoenix/hbase-site.xml| 12 - python/doc/Makefile | 192 -- python/doc/api.rst | 30 - python/doc/conf.py | 287 --- python/doc/index.rst| 27 - python/doc/versions.rst |3 - python/docker-compose.yml | 21 - python/examples/basic.py| 27 - python/examples/shell.py| 33 - python/gen-protobuf.sh | 38 - python/phoenixdb/NEWS.rst | 44 + python/phoenixdb/README.rst | 136 ++ python/phoenixdb/RELEASING.rst | 12 + python/phoenixdb/__init__.py| 68 - python/phoenixdb/avatica/__init__.py| 16 - python/phoenixdb/avatica/client.py | 510 -- python/phoenixdb/avatica/proto/__init__.py |0 python/phoenixdb/avatica/proto/common_pb2.py| 1667 -- python/phoenixdb/avatica/proto/requests_pb2.py | 1206 - python/phoenixdb/avatica/proto/responses_pb2.py | 917 -- python/phoenixdb/ci/build-env/Dockerfile|7 + python/phoenixdb/ci/phoenix/Dockerfile | 33 + .../phoenixdb/ci/phoenix/docker-entrypoint.sh | 24 + python/phoenixdb/ci/phoenix/hbase-site.xml | 12 + python/phoenixdb/connection.py | 187 -- python/phoenixdb/cursor.py | 347 python/phoenixdb/doc/Makefile | 192 ++ python/phoenixdb/doc/api.rst| 30 + python/phoenixdb/doc/conf.py| 287 +++ python/phoenixdb/doc/index.rst | 27 + python/phoenixdb/doc/versions.rst |3 + python/phoenixdb/docker-compose.yml | 21 + python/phoenixdb/errors.py | 93 - python/phoenixdb/examples/basic.py | 27 + python/phoenixdb/examples/shell.py | 33 + python/phoenixdb/gen-protobuf.sh| 39 + python/phoenixdb/phoenixdb/__init__.py | 72 + python/phoenixdb/phoenixdb/avatica/__init__.py | 16 + python/phoenixdb/phoenixdb/avatica/client.py| 502 ++ .../phoenixdb/avatica/proto/__init__.py |0 .../phoenixdb/avatica/proto/common_pb2.py | 1667 ++ .../phoenixdb/avatica/proto/requests_pb2.py | 1206 + .../phoenixdb/avatica/proto/responses_pb2.py| 917 ++ python/phoenixdb/phoenixdb/connection.py| 187 ++ python/phoenixdb/phoenixdb/cursor.py| 347 python/phoenixdb/phoenixdb/errors.py| 93 + python/phoenixdb/phoenixdb/tests/__init__.py| 44 + python/phoenixdb/phoenixdb/tests/dbapi20.py | 857 + .../phoenixdb/phoenixdb/tests/test_avatica.py | 25 + .../phoenixdb/tests/test_connection.py | 42 + python/phoenixdb/phoenixdb/tests/test_db.py | 99 ++ .../phoenixdb/phoenixdb/tests/test_dbapi20.py | 122 ++ python/phoenixdb/phoenixdb/tests/test_errors.py | 60 + python/phoenixdb/phoenixdb/tests/test_types.py | 327 python/phoenixdb/phoenixdb/types.py | 202 +++
[31/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ec3542d6/python/requests-kerberos/tests/test_requests_kerberos.py
--
diff --git a/python/requests-kerberos/tests/test_requests_kerberos.py
b/python/requests-kerberos/tests/test_requests_kerberos.py
new file mode 100644
index 000..ebaca37
--- /dev/null
+++ b/python/requests-kerberos/tests/test_requests_kerberos.py
@@ -0,0 +1,904 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""Tests for requests_kerberos."""
+
+import base64
+from mock import Mock, patch
+from requests.compat import urlparse
+import requests
+import warnings
+
+
+try:
+import kerberos
+kerberos_module_name='kerberos'
+except ImportError:
+import winkerberos as kerberos # On Windows
+kerberos_module_name = 'winkerberos'
+
+import requests_kerberos
+import unittest
+from requests_kerberos.kerberos_ import _get_certificate_hash
+
+# kerberos.authClientInit() is called with the service name (HTTP@FQDN) and
+# returns 1 and a kerberos context object on success. Returns -1 on failure.
+clientInit_complete = Mock(return_value=(1, "CTX"))
+clientInit_error = Mock(return_value=(-1, "CTX"))
+
+# kerberos.authGSSClientStep() is called with the kerberos context object
+# returned by authGSSClientInit and the negotiate auth token provided in the
+# http response's www-authenticate header. It returns 0 or 1 on success. 0
+# Indicates that authentication is progressing but not complete.
+clientStep_complete = Mock(return_value=1)
+clientStep_continue = Mock(return_value=0)
+clientStep_error = Mock(return_value=-1)
+clientStep_exception = Mock(side_effect=kerberos.GSSError)
+
+# kerberos.authGSSCLientResponse() is called with the kerberos context which
+# was initially returned by authGSSClientInit and had been mutated by a call by
+# authGSSClientStep. It returns a string.
+clientResponse = Mock(return_value="GSSRESPONSE")
+
+# Note: we're not using the @mock.patch decorator:
+# > My only word of warning is that in the past, the patch decorator hides
+# > tests when using the standard unittest library.
+# > -- sigmavirus24 in https://github.com/requests/requests-kerberos/issues/1
+
+
+class KerberosTestCase(unittest.TestCase):
+
+def setUp(self):
+"""Setup."""
+clientInit_complete.reset_mock()
+clientInit_error.reset_mock()
+clientStep_complete.reset_mock()
+clientStep_continue.reset_mock()
+clientStep_error.reset_mock()
+clientStep_exception.reset_mock()
+clientResponse.reset_mock()
+
+def tearDown(self):
+"""Teardown."""
+pass
+
+def test_negotate_value_extraction(self):
+response = requests.Response()
+response.headers = {'www-authenticate': 'negotiate token'}
+self.assertEqual(
+requests_kerberos.kerberos_._negotiate_value(response),
+'token'
+)
+
+def test_negotate_value_extraction_none(self):
+response = requests.Response()
+response.headers = {}
+self.assertTrue(
+requests_kerberos.kerberos_._negotiate_value(response) is None
+)
+
+def test_force_preemptive(self):
+with patch.multiple(kerberos_module_name,
+authGSSClientInit=clientInit_complete,
+authGSSClientResponse=clientResponse,
+authGSSClientStep=clientStep_continue):
+auth = requests_kerberos.HTTPKerberosAuth(force_preemptive=True)
+
+request = requests.Request(url="http://www.example.org;)
+
+auth.__call__(request)
+
+self.assertTrue('Authorization' in request.headers)
+self.assertEqual(request.headers.get('Authorization'), 'Negotiate
GSSRESPONSE')
+
+def test_no_force_preemptive(self):
+with patch.multiple(kerberos_module_name,
+authGSSClientInit=clientInit_complete,
+authGSSClientResponse=clientResponse,
+authGSSClientStep=clientStep_continue):
+auth = requests_kerberos.HTTPKerberosAuth()
+
+request = requests.Request(url="http://www.example.org;)
+
+auth.__call__(request)
+
+self.assertTrue('Authorization' not in request.headers)
+
+def test_generate_request_header(self):
+with patch.multiple(kerberos_module_name,
+authGSSClientInit=clientInit_complete,
+authGSSClientResponse=clientResponse,
+authGSSClientStep=clientStep_continue):
+response = requests.Response()
+response.url = "http://www.example.org/;
+response.headers = {'www-authenticate': 'negotiate token'}
+host = urlparse(response.url).hostname
+auth = requests_kerberos.HTTPKerberosAuth()
+self.assertEqual(
+
[17/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
http://git-wip-us.apache.org/repos/asf/phoenix/blob/a0094991/python/phoenixdb/connection.py
--
diff --git a/python/phoenixdb/connection.py b/python/phoenixdb/connection.py
deleted file mode 100644
index 593a242..000
--- a/python/phoenixdb/connection.py
+++ /dev/null
@@ -1,187 +0,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.
-
-import logging
-import uuid
-import weakref
-from phoenixdb import errors
-from phoenixdb.avatica.client import OPEN_CONNECTION_PROPERTIES
-from phoenixdb.cursor import Cursor
-from phoenixdb.errors import ProgrammingError
-
-__all__ = ['Connection']
-
-logger = logging.getLogger(__name__)
-
-
-class Connection(object):
-"""Database connection.
-
-You should not construct this object manually, use
:func:`~phoenixdb.connect` instead.
-"""
-
-cursor_factory = None
-"""
-The default cursor factory used by :meth:`cursor` if the parameter is not
specified.
-"""
-
-def __init__(self, client, cursor_factory=None, **kwargs):
-self._client = client
-self._closed = False
-if cursor_factory is not None:
-self.cursor_factory = cursor_factory
-else:
-self.cursor_factory = Cursor
-self._cursors = []
-# Extract properties to pass to OpenConnectionRequest
-self._connection_args = {}
-# The rest of the kwargs
-self._filtered_args = {}
-for k in kwargs:
-if k in OPEN_CONNECTION_PROPERTIES:
-self._connection_args[k] = kwargs[k]
-else:
-self._filtered_args[k] = kwargs[k]
-self.open()
-self.set_session(**self._filtered_args)
-
-def __del__(self):
-if not self._closed:
-self.close()
-
-def __enter__(self):
-return self
-
-def __exit__(self, exc_type, exc_value, traceback):
-if not self._closed:
-self.close()
-
-def open(self):
-"""Opens the connection."""
-self._id = str(uuid.uuid4())
-self._client.open_connection(self._id, info=self._connection_args)
-
-def close(self):
-"""Closes the connection.
-No further operations are allowed, either on the connection or any
-of its cursors, once the connection is closed.
-
-If the connection is used in a ``with`` statement, this method will
-be automatically called at the end of the ``with`` block.
-"""
-if self._closed:
-raise ProgrammingError('the connection is already closed')
-for cursor_ref in self._cursors:
-cursor = cursor_ref()
-if cursor is not None and not cursor._closed:
-cursor.close()
-self._client.close_connection(self._id)
-self._client.close()
-self._closed = True
-
-@property
-def closed(self):
-"""Read-only attribute specifying if the connection is closed or
not."""
-return self._closed
-
-def commit(self):
-"""Commits pending database changes.
-
-Currently, this does nothing, because the RPC does not support
-transactions. Only defined for DB API 2.0 compatibility.
-You need to use :attr:`autocommit` mode.
-"""
-# TODO can support be added for this?
-if self._closed:
-raise ProgrammingError('the connection is already closed')
-
-def cursor(self, cursor_factory=None):
-"""Creates a new cursor.
-
-:param cursor_factory:
-This argument can be used to create non-standard cursors.
-The class returned must be a subclass of
-:class:`~phoenixdb.cursor.Cursor` (for example
:class:`~phoenixdb.cursor.DictCursor`).
-A default factory for the connection can also be specified using
the
-:attr:`cursor_factory` attribute.
-
-:returns:
-A :class:`~phoenixdb.cursor.Cursor` object.
-"""
-if self._closed:
-raise ProgrammingError('the connection is already closed')
-cursor = (cursor_factory or self.cursor_factory)(self)
-self._cursors.append(weakref.ref(cursor, self._cursors.remove))
[29/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e62be9c8/python/phoenixdb/avatica/__init__.py
--
diff --git a/python/phoenixdb/avatica/__init__.py
b/python/phoenixdb/avatica/__init__.py
deleted file mode 100644
index 53776d7..000
--- a/python/phoenixdb/avatica/__init__.py
+++ /dev/null
@@ -1,16 +0,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.
-
-from .client import AvaticaClient # noqa: F401
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e62be9c8/python/phoenixdb/avatica/client.py
--
diff --git a/python/phoenixdb/avatica/client.py
b/python/phoenixdb/avatica/client.py
deleted file mode 100644
index ea00631..000
--- a/python/phoenixdb/avatica/client.py
+++ /dev/null
@@ -1,510 +0,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.
-
-"""Implementation of the JSON-over-HTTP RPC protocol used by Avatica."""
-
-import re
-import socket
-import pprint
-import math
-import logging
-import time
-from phoenixdb import errors
-from phoenixdb.avatica.proto import requests_pb2, common_pb2, responses_pb2
-
-try:
-import httplib
-except ImportError:
-import http.client as httplib
-
-try:
-import urlparse
-except ImportError:
-import urllib.parse as urlparse
-
-try:
-from HTMLParser import HTMLParser
-except ImportError:
-from html.parser import HTMLParser
-
-__all__ = ['AvaticaClient']
-
-logger = logging.getLogger(__name__)
-
-
-class JettyErrorPageParser(HTMLParser):
-
-def __init__(self):
-HTMLParser.__init__(self)
-self.path = []
-self.title = []
-self.message = []
-
-def handle_starttag(self, tag, attrs):
-self.path.append(tag)
-
-def handle_endtag(self, tag):
-self.path.pop()
-
-def handle_data(self, data):
-if len(self.path) > 2 and self.path[0] == 'html' and self.path[1] ==
'body':
-if len(self.path) == 3 and self.path[2] == 'h2':
-self.title.append(data.strip())
-elif len(self.path) == 4 and self.path[2] == 'p' and self.path[3]
== 'pre':
-self.message.append(data.strip())
-
-
-def parse_url(url):
-url = urlparse.urlparse(url)
-if not url.scheme and not url.netloc and url.path:
-netloc = url.path
-if ':' not in netloc:
-netloc = '{}:8765'.format(netloc)
-return urlparse.ParseResult('http', netloc, '/', '', '', '')
-return url
-
-
-# Defined in
phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java
-SQLSTATE_ERROR_CLASSES = [
-('08', errors.OperationalError), # Connection Exception
-('22018', errors.IntegrityError), # Constraint violatioin.
-('22', errors.DataError), # Data Exception
-('23', errors.IntegrityError), # Constraint Violation
-('24', errors.InternalError), # Invalid Cursor State
-('25', errors.InternalError), # Invalid Transaction State
-('42', errors.ProgrammingError), # Syntax Error or Access Rule Violation
-('XLC', errors.OperationalError), # Execution exceptions
-('INT', errors.InternalError), # Phoenix internal error
-]
-
-# Relevant properties as defined by
https://calcite.apache.org/avatica/docs/client_reference.html
-OPEN_CONNECTION_PROPERTIES = (
-'user', # User for the database connection
-'password', # Password for the user
-)
-
-
-def raise_sql_error(code, sqlstate, message):
-for
[16/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
http://git-wip-us.apache.org/repos/asf/phoenix/blob/a0094991/python/phoenixdb/phoenixdb/avatica/proto/common_pb2.py
--
diff --git a/python/phoenixdb/phoenixdb/avatica/proto/common_pb2.py
b/python/phoenixdb/phoenixdb/avatica/proto/common_pb2.py
new file mode 100644
index 000..3c99502
--- /dev/null
+++ b/python/phoenixdb/phoenixdb/avatica/proto/common_pb2.py
@@ -0,0 +1,1667 @@
+# Generated by the protocol buffer compiler. DO NOT EDIT!
+# source: common.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf.internal import enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf import descriptor_pb2
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+ name='common.proto',
+ package='',
+ syntax='proto3',
+
serialized_pb=_b('\n\x0c\x63ommon.proto\"\xc0\x01\n\x14\x43onnectionProperties\x12\x10\n\x08is_dirty\x18\x01
\x01(\x08\x12\x13\n\x0b\x61uto_commit\x18\x02
\x01(\x08\x12\x17\n\x0fhas_auto_commit\x18\x07
\x01(\x08\x12\x11\n\tread_only\x18\x03
\x01(\x08\x12\x15\n\rhas_read_only\x18\x08
\x01(\x08\x12\x1d\n\x15transaction_isolation\x18\x04
\x01(\r\x12\x0f\n\x07\x63\x61talog\x18\x05 \x01(\t\x12\x0e\n\x06schema\x18\x06
\x01(\t\"S\n\x0fStatementHandle\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\n\n\x02id\x18\x02 \x01(\r\x12\x1d\n\tsignature\x18\x03
\x01(\x0b\x32\n.Signature\"\xb0\x01\n\tSignature\x12 \n\x07\x63olumns\x18\x01
\x03(\x0b\x32\x0f.ColumnMetaData\x12\x0b\n\x03sql\x18\x02
\x01(\t\x12%\n\nparameters\x18\x03
\x03(\x0b\x32\x11.AvaticaParameter\x12&\n\x0e\x63ursor_factory\x18\x04
\x01(\x0b\x32\x0e.CursorFactory\x12%\n\rstatementType\x18\x05
\x01(\x0e\x32\x0e.StatementType\"\xad\x03\n\x0e\x43olumnMetaData\x12\x0f\n\x07ordinal\x18\x01
\x01(\r\x12\x16\n\x0e\x61uto_increment\x18\x02 \x
01(\x08\x12\x16\n\x0e\x63\x61se_sensitive\x18\x03
\x01(\x08\x12\x12\n\nsearchable\x18\x04
\x01(\x08\x12\x10\n\x08\x63urrency\x18\x05
\x01(\x08\x12\x10\n\x08nullable\x18\x06 \x01(\r\x12\x0e\n\x06signed\x18\x07
\x01(\x08\x12\x14\n\x0c\x64isplay_size\x18\x08 \x01(\r\x12\r\n\x05label\x18\t
\x01(\t\x12\x13\n\x0b\x63olumn_name\x18\n
\x01(\t\x12\x13\n\x0bschema_name\x18\x0b \x01(\t\x12\x11\n\tprecision\x18\x0c
\x01(\r\x12\r\n\x05scale\x18\r \x01(\r\x12\x12\n\ntable_name\x18\x0e
\x01(\t\x12\x14\n\x0c\x63\x61talog_name\x18\x0f
\x01(\t\x12\x11\n\tread_only\x18\x10 \x01(\x08\x12\x10\n\x08writable\x18\x11
\x01(\x08\x12\x1b\n\x13\x64\x65\x66initely_writable\x18\x12
\x01(\x08\x12\x19\n\x11\x63olumn_class_name\x18\x13
\x01(\t\x12\x1a\n\x04type\x18\x14
\x01(\x0b\x32\x0c.AvaticaType\"}\n\x0b\x41vaticaType\x12\n\n\x02id\x18\x01
\x01(\r\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x11\n\x03rep\x18\x03
\x01(\x0e\x32\x04.Rep\x12 \n\x07\x63olumns\x18\x04
\x03(\x0b\x32\x0f.ColumnMetaData\x12\x1f\n\tcomponent\x18
\x05
\x01(\x0b\x32\x0c.AvaticaType\"\x91\x01\n\x10\x41vaticaParameter\x12\x0e\n\x06signed\x18\x01
\x01(\x08\x12\x11\n\tprecision\x18\x02 \x01(\r\x12\r\n\x05scale\x18\x03
\x01(\r\x12\x16\n\x0eparameter_type\x18\x04
\x01(\r\x12\x11\n\ttype_name\x18\x05 \x01(\t\x12\x12\n\nclass_name\x18\x06
\x01(\t\x12\x0c\n\x04name\x18\x07
\x01(\t\"\xb3\x01\n\rCursorFactory\x12#\n\x05style\x18\x01
\x01(\x0e\x32\x14.CursorFactory.Style\x12\x12\n\nclass_name\x18\x02
\x01(\t\x12\x13\n\x0b\x66ield_names\x18\x03
\x03(\t\"T\n\x05Style\x12\n\n\x06OBJECT\x10\x00\x12\n\n\x06RECORD\x10\x01\x12\x15\n\x11RECORD_PROJECTION\x10\x02\x12\t\n\x05\x41RRAY\x10\x03\x12\x08\n\x04LIST\x10\x04\x12\x07\n\x03MAP\x10\x05\"9\n\x05\x46rame\x12\x0e\n\x06offset\x18\x01
\x01(\x04\x12\x0c\n\x04\x64one\x18\x02 \x01(\x08\x12\x12\n\x04rows\x18\x03
\x03(\x0b\x32\x04.Row\"\"\n\x03Row\x12\x1b\n\x05value\x18\x01
\x03(\x0b\x32\x0c.ColumnValue\"3\n\x10\x44\x61tabaseProperty\x12\x0c\n\x04name\x18\x01
\x01(\t\x12\x11\n\tfunctions\x18\x02 \x03(
\t\"4\n\x0bWireMessage\x12\x0c\n\x04name\x18\x01
\x01(\t\x12\x17\n\x0fwrapped_message\x18\x02
\x01(\x0c\"\x87\x01\n\x0b\x43olumnValue\x12\x1a\n\x05value\x18\x01
\x03(\x0b\x32\x0b.TypedValue\x12 \n\x0b\x61rray_value\x18\x02
\x03(\x0b\x32\x0b.TypedValue\x12\x17\n\x0fhas_array_value\x18\x03
\x01(\x08\x12!\n\x0cscalar_value\x18\x04
\x01(\x0b\x32\x0b.TypedValue\"\xf2\x01\n\nTypedValue\x12\x12\n\x04type\x18\x01
\x01(\x0e\x32\x04.Rep\x12\x12\n\nbool_value\x18\x02
\x01(\x08\x12\x14\n\x0cstring_value\x18\x03
\x01(\t\x12\x14\n\x0cnumber_value\x18\x04
\x01(\x12\x12\x13\n\x0b\x62ytes_value\x18\x05
\x01(\x0c\x12\x14\n\x0c\x64ouble_value\x18\x06
\x01(\x01\x12\x0c\n\x04null\x18\x07 \x01(\x08\x12 \n\x0b\x61rray_value\x18\x08
\x03(\x0b\x32\x0b.TypedValue\x12\x1c\n\x0e\x63omponent_type\x18\t
[22/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e62be9c8/python/phoenixdb/types.py
--
diff --git a/python/phoenixdb/types.py b/python/phoenixdb/types.py
deleted file mode 100644
index f41355a..000
--- a/python/phoenixdb/types.py
+++ /dev/null
@@ -1,202 +0,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.
-
-import sys
-import time
-import datetime
-from decimal import Decimal
-from phoenixdb.avatica.proto import common_pb2
-
-__all__ = [
-'Date', 'Time', 'Timestamp', 'DateFromTicks', 'TimeFromTicks',
'TimestampFromTicks',
-'Binary', 'STRING', 'BINARY', 'NUMBER', 'DATETIME', 'ROWID', 'BOOLEAN',
-'JAVA_CLASSES', 'JAVA_CLASSES_MAP', 'TypeHelper',
-]
-
-
-def Date(year, month, day):
-"""Constructs an object holding a date value."""
-return datetime.date(year, month, day)
-
-
-def Time(hour, minute, second):
-"""Constructs an object holding a time value."""
-return datetime.time(hour, minute, second)
-
-
-def Timestamp(year, month, day, hour, minute, second):
-"""Constructs an object holding a datetime/timestamp value."""
-return datetime.datetime(year, month, day, hour, minute, second)
-
-
-def DateFromTicks(ticks):
-"""Constructs an object holding a date value from the given UNIX
timestamp."""
-return Date(*time.localtime(ticks)[:3])
-
-
-def TimeFromTicks(ticks):
-"""Constructs an object holding a time value from the given UNIX
timestamp."""
-return Time(*time.localtime(ticks)[3:6])
-
-
-def TimestampFromTicks(ticks):
-"""Constructs an object holding a datetime/timestamp value from the given
UNIX timestamp."""
-return Timestamp(*time.localtime(ticks)[:6])
-
-
-def Binary(value):
-"""Constructs an object capable of holding a binary (long) string value."""
-return bytes(value)
-
-
-def time_from_java_sql_time(n):
-dt = datetime.datetime(1970, 1, 1) + datetime.timedelta(milliseconds=n)
-return dt.time()
-
-
-def time_to_java_sql_time(t):
-return ((t.hour * 60 + t.minute) * 60 + t.second) * 1000 + t.microsecond
// 1000
-
-
-def date_from_java_sql_date(n):
-return datetime.date(1970, 1, 1) + datetime.timedelta(days=n)
-
-
-def date_to_java_sql_date(d):
-if isinstance(d, datetime.datetime):
-d = d.date()
-td = d - datetime.date(1970, 1, 1)
-return td.days
-
-
-def datetime_from_java_sql_timestamp(n):
-return datetime.datetime(1970, 1, 1) + datetime.timedelta(milliseconds=n)
-
-
-def datetime_to_java_sql_timestamp(d):
-td = d - datetime.datetime(1970, 1, 1)
-return td.microseconds // 1000 + (td.seconds + td.days * 24 * 3600) * 1000
-
-
-class ColumnType(object):
-
-def __init__(self, eq_types):
-self.eq_types = tuple(eq_types)
-self.eq_types_set = set(eq_types)
-
-def __eq__(self, other):
-return other in self.eq_types_set
-
-def __cmp__(self, other):
-if other in self.eq_types_set:
-return 0
-if other < self.eq_types:
-return 1
-else:
-return -1
-
-
-STRING = ColumnType(['VARCHAR', 'CHAR'])
-"""Type object that can be used to describe string-based columns."""
-
-BINARY = ColumnType(['BINARY', 'VARBINARY'])
-"""Type object that can be used to describe (long) binary columns."""
-
-NUMBER = ColumnType([
-'INTEGER', 'UNSIGNED_INT', 'BIGINT', 'UNSIGNED_LONG', 'TINYINT',
'UNSIGNED_TINYINT',
-'SMALLINT', 'UNSIGNED_SMALLINT', 'FLOAT', 'UNSIGNED_FLOAT', 'DOUBLE',
'UNSIGNED_DOUBLE', 'DECIMAL'
-])
-"""Type object that can be used to describe numeric columns."""
-
-DATETIME = ColumnType(['TIME', 'DATE', 'TIMESTAMP', 'UNSIGNED_TIME',
'UNSIGNED_DATE', 'UNSIGNED_TIMESTAMP'])
-"""Type object that can be used to describe date/time columns."""
-
-ROWID = ColumnType([])
-"""Only implemented for DB API 2.0 compatibility, not used."""
-
-BOOLEAN = ColumnType(['BOOLEAN'])
-"""Type object that can be used to describe boolean columns. This is a
phoenixdb-specific extension."""
-
-
-# XXX ARRAY
-
-if sys.version_info[0] < 3:
-_long = long # noqa: F821
-else:
-_long = int
-
-JAVA_CLASSES = {
-'bool_value': [
-('java.lang.Boolean', common_pb2.BOOLEAN, None, None),
-],
-
[08/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
http://git-wip-us.apache.org/repos/asf/phoenix/blob/14b57801/python/phoenixdb/avatica/proto/requests_pb2.py
--
diff --git a/python/phoenixdb/avatica/proto/requests_pb2.py
b/python/phoenixdb/avatica/proto/requests_pb2.py
deleted file mode 100644
index 203f945..000
--- a/python/phoenixdb/avatica/proto/requests_pb2.py
+++ /dev/null
@@ -1,1206 +0,0 @@
-# Generated by the protocol buffer compiler. DO NOT EDIT!
-# source: requests.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from . import common_pb2 as common__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
- name='requests.proto',
- package='',
- syntax='proto3',
-
serialized_pb=_b('\n\x0erequests.proto\x1a\x0c\x63ommon.proto\"(\n\x0f\x43\x61talogsRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"0\n\x17\x44\x61tabasePropertyRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"P\n\x0eSchemasRequest\x12\x0f\n\x07\x63\x61talog\x18\x01
\x01(\t\x12\x16\n\x0eschema_pattern\x18\x02
\x01(\t\x12\x15\n\rconnection_id\x18\x03
\x01(\t\"\x95\x01\n\rTablesRequest\x12\x0f\n\x07\x63\x61talog\x18\x01
\x01(\t\x12\x16\n\x0eschema_pattern\x18\x02
\x01(\t\x12\x1a\n\x12table_name_pattern\x18\x03
\x01(\t\x12\x11\n\ttype_list\x18\x04 \x03(\t\x12\x15\n\rhas_type_list\x18\x06
\x01(\x08\x12\x15\n\rconnection_id\x18\x07
\x01(\t\"*\n\x11TableTypesRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"\x89\x01\n\x0e\x43olumnsRequest\x12\x0f\n\x07\x63\x61talog\x18\x01
\x01(\t\x12\x16\n\x0eschema_pattern\x18\x02
\x01(\t\x12\x1a\n\x12table_name_pattern\x18\x03
\x01(\t\x12\x1b\n\x13\x63olumn_name_pattern\x18\x04
\x01(\t\x12\x15\n\rconnection_id\x18\x05 \x01(\t\"(\n\x0fTypeInfoReque
st\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"\xa1\x01\n\x18PrepareAndExecuteRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\x0b\n\x03sql\x18\x02 \x01(\t\x12\x15\n\rmax_row_count\x18\x03
\x01(\x04\x12\x14\n\x0cstatement_id\x18\x04
\x01(\r\x12\x16\n\x0emax_rows_total\x18\x05
\x01(\x03\x12\x1c\n\x14\x66irst_frame_max_size\x18\x06
\x01(\x05\"c\n\x0ePrepareRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\x0b\n\x03sql\x18\x02 \x01(\t\x12\x15\n\rmax_row_count\x18\x03
\x01(\x04\x12\x16\n\x0emax_rows_total\x18\x04
\x01(\x03\"\x80\x01\n\x0c\x46\x65tchRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\x14\n\x0cstatement_id\x18\x02 \x01(\r\x12\x0e\n\x06offset\x18\x03
\x01(\x04\x12\x1b\n\x13\x66\x65tch_max_row_count\x18\x04
\x01(\r\x12\x16\n\x0e\x66rame_max_size\x18\x05
\x01(\x05\"/\n\x16\x43reateStatementRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"D\n\x15\x43loseStatementRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\x14\n\x0cstatement_id\x18\x02 \x01(\r\"\x8b\x01\n\x15Op
enConnectionRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12.\n\x04info\x18\x02 \x03(\x0b\x32
.OpenConnectionRequest.InfoEntry\x1a+\n\tInfoEntry\x12\x0b\n\x03key\x18\x01
\x01(\t\x12\r\n\x05value\x18\x02
\x01(\t:\x02\x38\x01\"/\n\x16\x43loseConnectionRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"Y\n\x15\x43onnectionSyncRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12)\n\nconn_props\x18\x02
\x01(\x0b\x32\x15.ConnectionProperties\"\xc7\x01\n\x0e\x45xecuteRequest\x12)\n\x0fstatementHandle\x18\x01
\x01(\x0b\x32\x10.StatementHandle\x12%\n\x10parameter_values\x18\x02
\x03(\x0b\x32\x0b.TypedValue\x12\'\n\x1f\x64\x65precated_first_frame_max_size\x18\x03
\x01(\x04\x12\x1c\n\x14has_parameter_values\x18\x04
\x01(\x08\x12\x1c\n\x14\x66irst_frame_max_size\x18\x05
\x01(\x05\"m\n\x12SyncResultsRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\x14\n\x0cstatement_id\x18\x02 \x01(\r\x12\x1a\n\x05state\x18\x03
\x01(\x0b\x32\x0b.QueryState\x12\x0e\n\x06offset\x18\x04 \x01(\x04\"&\n\rCommi
tRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"(\n\x0fRollbackRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"b\n\x1dPrepareAndExecuteBatchRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\x14\n\x0cstatement_id\x18\x02
\x01(\r\x12\x14\n\x0csql_commands\x18\x03
\x03(\t\"4\n\x0bUpdateBatch\x12%\n\x10parameter_values\x18\x01
\x03(\x0b\x32\x0b.TypedValue\"a\n\x13\x45xecuteBatchRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\x14\n\x0cstatement_id\x18\x02 \x01(\r\x12\x1d\n\x07updates\x18\x03
\x03(\x0b\x32\x0c.UpdateBatchB\"\n org.apache.calcite.avatica.protob\x06proto3')
- ,
- dependencies=[common__pb2.DESCRIPTOR,])
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-
-
-
-_CATALOGSREQUEST = _descriptor.Descriptor(
- name='CatalogsRequest',
- full_name='CatalogsRequest',
- filename=None,
- file=DESCRIPTOR,
- containing_type=None,
[12/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
http://git-wip-us.apache.org/repos/asf/phoenix/blob/a0094991/python/phoenixdb/types.py
--
diff --git a/python/phoenixdb/types.py b/python/phoenixdb/types.py
deleted file mode 100644
index f41355a..000
--- a/python/phoenixdb/types.py
+++ /dev/null
@@ -1,202 +0,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.
-
-import sys
-import time
-import datetime
-from decimal import Decimal
-from phoenixdb.avatica.proto import common_pb2
-
-__all__ = [
-'Date', 'Time', 'Timestamp', 'DateFromTicks', 'TimeFromTicks',
'TimestampFromTicks',
-'Binary', 'STRING', 'BINARY', 'NUMBER', 'DATETIME', 'ROWID', 'BOOLEAN',
-'JAVA_CLASSES', 'JAVA_CLASSES_MAP', 'TypeHelper',
-]
-
-
-def Date(year, month, day):
-"""Constructs an object holding a date value."""
-return datetime.date(year, month, day)
-
-
-def Time(hour, minute, second):
-"""Constructs an object holding a time value."""
-return datetime.time(hour, minute, second)
-
-
-def Timestamp(year, month, day, hour, minute, second):
-"""Constructs an object holding a datetime/timestamp value."""
-return datetime.datetime(year, month, day, hour, minute, second)
-
-
-def DateFromTicks(ticks):
-"""Constructs an object holding a date value from the given UNIX
timestamp."""
-return Date(*time.localtime(ticks)[:3])
-
-
-def TimeFromTicks(ticks):
-"""Constructs an object holding a time value from the given UNIX
timestamp."""
-return Time(*time.localtime(ticks)[3:6])
-
-
-def TimestampFromTicks(ticks):
-"""Constructs an object holding a datetime/timestamp value from the given
UNIX timestamp."""
-return Timestamp(*time.localtime(ticks)[:6])
-
-
-def Binary(value):
-"""Constructs an object capable of holding a binary (long) string value."""
-return bytes(value)
-
-
-def time_from_java_sql_time(n):
-dt = datetime.datetime(1970, 1, 1) + datetime.timedelta(milliseconds=n)
-return dt.time()
-
-
-def time_to_java_sql_time(t):
-return ((t.hour * 60 + t.minute) * 60 + t.second) * 1000 + t.microsecond
// 1000
-
-
-def date_from_java_sql_date(n):
-return datetime.date(1970, 1, 1) + datetime.timedelta(days=n)
-
-
-def date_to_java_sql_date(d):
-if isinstance(d, datetime.datetime):
-d = d.date()
-td = d - datetime.date(1970, 1, 1)
-return td.days
-
-
-def datetime_from_java_sql_timestamp(n):
-return datetime.datetime(1970, 1, 1) + datetime.timedelta(milliseconds=n)
-
-
-def datetime_to_java_sql_timestamp(d):
-td = d - datetime.datetime(1970, 1, 1)
-return td.microseconds // 1000 + (td.seconds + td.days * 24 * 3600) * 1000
-
-
-class ColumnType(object):
-
-def __init__(self, eq_types):
-self.eq_types = tuple(eq_types)
-self.eq_types_set = set(eq_types)
-
-def __eq__(self, other):
-return other in self.eq_types_set
-
-def __cmp__(self, other):
-if other in self.eq_types_set:
-return 0
-if other < self.eq_types:
-return 1
-else:
-return -1
-
-
-STRING = ColumnType(['VARCHAR', 'CHAR'])
-"""Type object that can be used to describe string-based columns."""
-
-BINARY = ColumnType(['BINARY', 'VARBINARY'])
-"""Type object that can be used to describe (long) binary columns."""
-
-NUMBER = ColumnType([
-'INTEGER', 'UNSIGNED_INT', 'BIGINT', 'UNSIGNED_LONG', 'TINYINT',
'UNSIGNED_TINYINT',
-'SMALLINT', 'UNSIGNED_SMALLINT', 'FLOAT', 'UNSIGNED_FLOAT', 'DOUBLE',
'UNSIGNED_DOUBLE', 'DECIMAL'
-])
-"""Type object that can be used to describe numeric columns."""
-
-DATETIME = ColumnType(['TIME', 'DATE', 'TIMESTAMP', 'UNSIGNED_TIME',
'UNSIGNED_DATE', 'UNSIGNED_TIMESTAMP'])
-"""Type object that can be used to describe date/time columns."""
-
-ROWID = ColumnType([])
-"""Only implemented for DB API 2.0 compatibility, not used."""
-
-BOOLEAN = ColumnType(['BOOLEAN'])
-"""Type object that can be used to describe boolean columns. This is a
phoenixdb-specific extension."""
-
-
-# XXX ARRAY
-
-if sys.version_info[0] < 3:
-_long = long # noqa: F821
-else:
-_long = int
-
-JAVA_CLASSES = {
-'bool_value': [
-('java.lang.Boolean', common_pb2.BOOLEAN, None, None),
-],
-
[14/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
http://git-wip-us.apache.org/repos/asf/phoenix/blob/a0094991/python/phoenixdb/phoenixdb/cursor.py
--
diff --git a/python/phoenixdb/phoenixdb/cursor.py
b/python/phoenixdb/phoenixdb/cursor.py
new file mode 100644
index 000..8be7bed
--- /dev/null
+++ b/python/phoenixdb/phoenixdb/cursor.py
@@ -0,0 +1,347 @@
+# 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.
+
+import logging
+import collections
+from phoenixdb.types import TypeHelper
+from phoenixdb.errors import ProgrammingError, InternalError
+from phoenixdb.avatica.proto import common_pb2
+
+__all__ = ['Cursor', 'ColumnDescription', 'DictCursor']
+
+logger = logging.getLogger(__name__)
+
+# TODO see note in Cursor.rowcount()
+MAX_INT = 2 ** 64 - 1
+
+ColumnDescription = collections.namedtuple('ColumnDescription', 'name
type_code display_size internal_size precision scale null_ok')
+"""Named tuple for representing results from :attr:`Cursor.description`."""
+
+
+class Cursor(object):
+"""Database cursor for executing queries and iterating over results.
+
+You should not construct this object manually, use
:meth:`Connection.cursor() ` instead.
+"""
+
+arraysize = 1
+"""
+Read/write attribute specifying the number of rows to fetch
+at a time with :meth:`fetchmany`. It defaults to 1 meaning to
+fetch a single row at a time.
+"""
+
+itersize = 2000
+"""
+Read/write attribute specifying the number of rows to fetch
+from the backend at each network roundtrip during iteration
+on the cursor. The default is 2000.
+"""
+
+def __init__(self, connection, id=None):
+self._connection = connection
+self._id = id
+self._signature = None
+self._column_data_types = []
+self._frame = None
+self._pos = None
+self._closed = False
+self.arraysize = self.__class__.arraysize
+self.itersize = self.__class__.itersize
+self._updatecount = -1
+
+def __del__(self):
+if not self._connection._closed and not self._closed:
+self.close()
+
+def __enter__(self):
+return self
+
+def __exit__(self, exc_type, exc_value, traceback):
+if not self._closed:
+self.close()
+
+def __iter__(self):
+return self
+
+def __next__(self):
+row = self.fetchone()
+if row is None:
+raise StopIteration
+return row
+
+next = __next__
+
+def close(self):
+"""Closes the cursor.
+No further operations are allowed once the cursor is closed.
+
+If the cursor is used in a ``with`` statement, this method will
+be automatically called at the end of the ``with`` block.
+"""
+if self._closed:
+raise ProgrammingError('the cursor is already closed')
+if self._id is not None:
+self._connection._client.close_statement(self._connection._id,
self._id)
+self._id = None
+self._signature = None
+self._column_data_types = []
+self._frame = None
+self._pos = None
+self._closed = True
+
+@property
+def closed(self):
+"""Read-only attribute specifying if the cursor is closed or not."""
+return self._closed
+
+@property
+def description(self):
+if self._signature is None:
+return None
+description = []
+for column in self._signature.columns:
+description.append(ColumnDescription(
+column.column_name,
+column.type.name,
+column.display_size,
+None,
+column.precision,
+column.scale,
+None if column.nullable == 2 else bool(column.nullable),
+))
+return description
+
+def _set_id(self, id):
+if self._id is not None and self._id != id:
+self._connection._client.close_statement(self._connection._id,
self._id)
+self._id = id
+
+def _set_signature(self, signature):
+self._signature = signature
+self._column_data_types = []
+self._parameter_data_types = []
+if signature is
[27/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e62be9c8/python/phoenixdb/connection.py
--
diff --git a/python/phoenixdb/connection.py b/python/phoenixdb/connection.py
deleted file mode 100644
index 593a242..000
--- a/python/phoenixdb/connection.py
+++ /dev/null
@@ -1,187 +0,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.
-
-import logging
-import uuid
-import weakref
-from phoenixdb import errors
-from phoenixdb.avatica.client import OPEN_CONNECTION_PROPERTIES
-from phoenixdb.cursor import Cursor
-from phoenixdb.errors import ProgrammingError
-
-__all__ = ['Connection']
-
-logger = logging.getLogger(__name__)
-
-
-class Connection(object):
-"""Database connection.
-
-You should not construct this object manually, use
:func:`~phoenixdb.connect` instead.
-"""
-
-cursor_factory = None
-"""
-The default cursor factory used by :meth:`cursor` if the parameter is not
specified.
-"""
-
-def __init__(self, client, cursor_factory=None, **kwargs):
-self._client = client
-self._closed = False
-if cursor_factory is not None:
-self.cursor_factory = cursor_factory
-else:
-self.cursor_factory = Cursor
-self._cursors = []
-# Extract properties to pass to OpenConnectionRequest
-self._connection_args = {}
-# The rest of the kwargs
-self._filtered_args = {}
-for k in kwargs:
-if k in OPEN_CONNECTION_PROPERTIES:
-self._connection_args[k] = kwargs[k]
-else:
-self._filtered_args[k] = kwargs[k]
-self.open()
-self.set_session(**self._filtered_args)
-
-def __del__(self):
-if not self._closed:
-self.close()
-
-def __enter__(self):
-return self
-
-def __exit__(self, exc_type, exc_value, traceback):
-if not self._closed:
-self.close()
-
-def open(self):
-"""Opens the connection."""
-self._id = str(uuid.uuid4())
-self._client.open_connection(self._id, info=self._connection_args)
-
-def close(self):
-"""Closes the connection.
-No further operations are allowed, either on the connection or any
-of its cursors, once the connection is closed.
-
-If the connection is used in a ``with`` statement, this method will
-be automatically called at the end of the ``with`` block.
-"""
-if self._closed:
-raise ProgrammingError('the connection is already closed')
-for cursor_ref in self._cursors:
-cursor = cursor_ref()
-if cursor is not None and not cursor._closed:
-cursor.close()
-self._client.close_connection(self._id)
-self._client.close()
-self._closed = True
-
-@property
-def closed(self):
-"""Read-only attribute specifying if the connection is closed or
not."""
-return self._closed
-
-def commit(self):
-"""Commits pending database changes.
-
-Currently, this does nothing, because the RPC does not support
-transactions. Only defined for DB API 2.0 compatibility.
-You need to use :attr:`autocommit` mode.
-"""
-# TODO can support be added for this?
-if self._closed:
-raise ProgrammingError('the connection is already closed')
-
-def cursor(self, cursor_factory=None):
-"""Creates a new cursor.
-
-:param cursor_factory:
-This argument can be used to create non-standard cursors.
-The class returned must be a subclass of
-:class:`~phoenixdb.cursor.Cursor` (for example
:class:`~phoenixdb.cursor.DictCursor`).
-A default factory for the connection can also be specified using
the
-:attr:`cursor_factory` attribute.
-
-:returns:
-A :class:`~phoenixdb.cursor.Cursor` object.
-"""
-if self._closed:
-raise ProgrammingError('the connection is already closed')
-cursor = (cursor_factory or self.cursor_factory)(self)
-self._cursors.append(weakref.ref(cursor, self._cursors.remove))
[34/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ec3542d6/python/phoenixdb/phoenixdb/cursor.py
--
diff --git a/python/phoenixdb/phoenixdb/cursor.py
b/python/phoenixdb/phoenixdb/cursor.py
new file mode 100644
index 000..8be7bed
--- /dev/null
+++ b/python/phoenixdb/phoenixdb/cursor.py
@@ -0,0 +1,347 @@
+# 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.
+
+import logging
+import collections
+from phoenixdb.types import TypeHelper
+from phoenixdb.errors import ProgrammingError, InternalError
+from phoenixdb.avatica.proto import common_pb2
+
+__all__ = ['Cursor', 'ColumnDescription', 'DictCursor']
+
+logger = logging.getLogger(__name__)
+
+# TODO see note in Cursor.rowcount()
+MAX_INT = 2 ** 64 - 1
+
+ColumnDescription = collections.namedtuple('ColumnDescription', 'name
type_code display_size internal_size precision scale null_ok')
+"""Named tuple for representing results from :attr:`Cursor.description`."""
+
+
+class Cursor(object):
+"""Database cursor for executing queries and iterating over results.
+
+You should not construct this object manually, use
:meth:`Connection.cursor() ` instead.
+"""
+
+arraysize = 1
+"""
+Read/write attribute specifying the number of rows to fetch
+at a time with :meth:`fetchmany`. It defaults to 1 meaning to
+fetch a single row at a time.
+"""
+
+itersize = 2000
+"""
+Read/write attribute specifying the number of rows to fetch
+from the backend at each network roundtrip during iteration
+on the cursor. The default is 2000.
+"""
+
+def __init__(self, connection, id=None):
+self._connection = connection
+self._id = id
+self._signature = None
+self._column_data_types = []
+self._frame = None
+self._pos = None
+self._closed = False
+self.arraysize = self.__class__.arraysize
+self.itersize = self.__class__.itersize
+self._updatecount = -1
+
+def __del__(self):
+if not self._connection._closed and not self._closed:
+self.close()
+
+def __enter__(self):
+return self
+
+def __exit__(self, exc_type, exc_value, traceback):
+if not self._closed:
+self.close()
+
+def __iter__(self):
+return self
+
+def __next__(self):
+row = self.fetchone()
+if row is None:
+raise StopIteration
+return row
+
+next = __next__
+
+def close(self):
+"""Closes the cursor.
+No further operations are allowed once the cursor is closed.
+
+If the cursor is used in a ``with`` statement, this method will
+be automatically called at the end of the ``with`` block.
+"""
+if self._closed:
+raise ProgrammingError('the cursor is already closed')
+if self._id is not None:
+self._connection._client.close_statement(self._connection._id,
self._id)
+self._id = None
+self._signature = None
+self._column_data_types = []
+self._frame = None
+self._pos = None
+self._closed = True
+
+@property
+def closed(self):
+"""Read-only attribute specifying if the cursor is closed or not."""
+return self._closed
+
+@property
+def description(self):
+if self._signature is None:
+return None
+description = []
+for column in self._signature.columns:
+description.append(ColumnDescription(
+column.column_name,
+column.type.name,
+column.display_size,
+None,
+column.precision,
+column.scale,
+None if column.nullable == 2 else bool(column.nullable),
+))
+return description
+
+def _set_id(self, id):
+if self._id is not None and self._id != id:
+self._connection._client.close_statement(self._connection._id,
self._id)
+self._id = id
+
+def _set_signature(self, signature):
+self._signature = signature
+self._column_data_types = []
+self._parameter_data_types = []
+if signature is
[25/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e62be9c8/python/phoenixdb/phoenixdb/avatica/proto/requests_pb2.py
--
diff --git a/python/phoenixdb/phoenixdb/avatica/proto/requests_pb2.py
b/python/phoenixdb/phoenixdb/avatica/proto/requests_pb2.py
new file mode 100644
index 000..203f945
--- /dev/null
+++ b/python/phoenixdb/phoenixdb/avatica/proto/requests_pb2.py
@@ -0,0 +1,1206 @@
+# Generated by the protocol buffer compiler. DO NOT EDIT!
+# source: requests.proto
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf import descriptor_pb2
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from . import common_pb2 as common__pb2
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+ name='requests.proto',
+ package='',
+ syntax='proto3',
+
serialized_pb=_b('\n\x0erequests.proto\x1a\x0c\x63ommon.proto\"(\n\x0f\x43\x61talogsRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"0\n\x17\x44\x61tabasePropertyRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"P\n\x0eSchemasRequest\x12\x0f\n\x07\x63\x61talog\x18\x01
\x01(\t\x12\x16\n\x0eschema_pattern\x18\x02
\x01(\t\x12\x15\n\rconnection_id\x18\x03
\x01(\t\"\x95\x01\n\rTablesRequest\x12\x0f\n\x07\x63\x61talog\x18\x01
\x01(\t\x12\x16\n\x0eschema_pattern\x18\x02
\x01(\t\x12\x1a\n\x12table_name_pattern\x18\x03
\x01(\t\x12\x11\n\ttype_list\x18\x04 \x03(\t\x12\x15\n\rhas_type_list\x18\x06
\x01(\x08\x12\x15\n\rconnection_id\x18\x07
\x01(\t\"*\n\x11TableTypesRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"\x89\x01\n\x0e\x43olumnsRequest\x12\x0f\n\x07\x63\x61talog\x18\x01
\x01(\t\x12\x16\n\x0eschema_pattern\x18\x02
\x01(\t\x12\x1a\n\x12table_name_pattern\x18\x03
\x01(\t\x12\x1b\n\x13\x63olumn_name_pattern\x18\x04
\x01(\t\x12\x15\n\rconnection_id\x18\x05 \x01(\t\"(\n\x0fTypeInfoReque
st\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"\xa1\x01\n\x18PrepareAndExecuteRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\x0b\n\x03sql\x18\x02 \x01(\t\x12\x15\n\rmax_row_count\x18\x03
\x01(\x04\x12\x14\n\x0cstatement_id\x18\x04
\x01(\r\x12\x16\n\x0emax_rows_total\x18\x05
\x01(\x03\x12\x1c\n\x14\x66irst_frame_max_size\x18\x06
\x01(\x05\"c\n\x0ePrepareRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\x0b\n\x03sql\x18\x02 \x01(\t\x12\x15\n\rmax_row_count\x18\x03
\x01(\x04\x12\x16\n\x0emax_rows_total\x18\x04
\x01(\x03\"\x80\x01\n\x0c\x46\x65tchRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\x14\n\x0cstatement_id\x18\x02 \x01(\r\x12\x0e\n\x06offset\x18\x03
\x01(\x04\x12\x1b\n\x13\x66\x65tch_max_row_count\x18\x04
\x01(\r\x12\x16\n\x0e\x66rame_max_size\x18\x05
\x01(\x05\"/\n\x16\x43reateStatementRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"D\n\x15\x43loseStatementRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\x14\n\x0cstatement_id\x18\x02 \x01(\r\"\x8b\x01\n\x15Op
enConnectionRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12.\n\x04info\x18\x02 \x03(\x0b\x32
.OpenConnectionRequest.InfoEntry\x1a+\n\tInfoEntry\x12\x0b\n\x03key\x18\x01
\x01(\t\x12\r\n\x05value\x18\x02
\x01(\t:\x02\x38\x01\"/\n\x16\x43loseConnectionRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"Y\n\x15\x43onnectionSyncRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12)\n\nconn_props\x18\x02
\x01(\x0b\x32\x15.ConnectionProperties\"\xc7\x01\n\x0e\x45xecuteRequest\x12)\n\x0fstatementHandle\x18\x01
\x01(\x0b\x32\x10.StatementHandle\x12%\n\x10parameter_values\x18\x02
\x03(\x0b\x32\x0b.TypedValue\x12\'\n\x1f\x64\x65precated_first_frame_max_size\x18\x03
\x01(\x04\x12\x1c\n\x14has_parameter_values\x18\x04
\x01(\x08\x12\x1c\n\x14\x66irst_frame_max_size\x18\x05
\x01(\x05\"m\n\x12SyncResultsRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\x14\n\x0cstatement_id\x18\x02 \x01(\r\x12\x1a\n\x05state\x18\x03
\x01(\x0b\x32\x0b.QueryState\x12\x0e\n\x06offset\x18\x04 \x01(\x04\"&\n\rCommi
tRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"(\n\x0fRollbackRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\"b\n\x1dPrepareAndExecuteBatchRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\x14\n\x0cstatement_id\x18\x02
\x01(\r\x12\x14\n\x0csql_commands\x18\x03
\x03(\t\"4\n\x0bUpdateBatch\x12%\n\x10parameter_values\x18\x01
\x03(\x0b\x32\x0b.TypedValue\"a\n\x13\x45xecuteBatchRequest\x12\x15\n\rconnection_id\x18\x01
\x01(\t\x12\x14\n\x0cstatement_id\x18\x02 \x01(\r\x12\x1d\n\x07updates\x18\x03
\x03(\x0b\x32\x0c.UpdateBatchB\"\n org.apache.calcite.avatica.protob\x06proto3')
+ ,
+ dependencies=[common__pb2.DESCRIPTOR,])
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+
+
+
+_CATALOGSREQUEST = _descriptor.Descriptor(
+ name='CatalogsRequest',
+ full_name='CatalogsRequest',
+ filename=None,
+
[24/40] phoenix git commit: PHOENIX-4688 Support SPNEGO for python driver via requests-kerberos
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e62be9c8/python/phoenixdb/phoenixdb/cursor.py
--
diff --git a/python/phoenixdb/phoenixdb/cursor.py
b/python/phoenixdb/phoenixdb/cursor.py
new file mode 100644
index 000..8be7bed
--- /dev/null
+++ b/python/phoenixdb/phoenixdb/cursor.py
@@ -0,0 +1,347 @@
+# 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.
+
+import logging
+import collections
+from phoenixdb.types import TypeHelper
+from phoenixdb.errors import ProgrammingError, InternalError
+from phoenixdb.avatica.proto import common_pb2
+
+__all__ = ['Cursor', 'ColumnDescription', 'DictCursor']
+
+logger = logging.getLogger(__name__)
+
+# TODO see note in Cursor.rowcount()
+MAX_INT = 2 ** 64 - 1
+
+ColumnDescription = collections.namedtuple('ColumnDescription', 'name
type_code display_size internal_size precision scale null_ok')
+"""Named tuple for representing results from :attr:`Cursor.description`."""
+
+
+class Cursor(object):
+"""Database cursor for executing queries and iterating over results.
+
+You should not construct this object manually, use
:meth:`Connection.cursor() ` instead.
+"""
+
+arraysize = 1
+"""
+Read/write attribute specifying the number of rows to fetch
+at a time with :meth:`fetchmany`. It defaults to 1 meaning to
+fetch a single row at a time.
+"""
+
+itersize = 2000
+"""
+Read/write attribute specifying the number of rows to fetch
+from the backend at each network roundtrip during iteration
+on the cursor. The default is 2000.
+"""
+
+def __init__(self, connection, id=None):
+self._connection = connection
+self._id = id
+self._signature = None
+self._column_data_types = []
+self._frame = None
+self._pos = None
+self._closed = False
+self.arraysize = self.__class__.arraysize
+self.itersize = self.__class__.itersize
+self._updatecount = -1
+
+def __del__(self):
+if not self._connection._closed and not self._closed:
+self.close()
+
+def __enter__(self):
+return self
+
+def __exit__(self, exc_type, exc_value, traceback):
+if not self._closed:
+self.close()
+
+def __iter__(self):
+return self
+
+def __next__(self):
+row = self.fetchone()
+if row is None:
+raise StopIteration
+return row
+
+next = __next__
+
+def close(self):
+"""Closes the cursor.
+No further operations are allowed once the cursor is closed.
+
+If the cursor is used in a ``with`` statement, this method will
+be automatically called at the end of the ``with`` block.
+"""
+if self._closed:
+raise ProgrammingError('the cursor is already closed')
+if self._id is not None:
+self._connection._client.close_statement(self._connection._id,
self._id)
+self._id = None
+self._signature = None
+self._column_data_types = []
+self._frame = None
+self._pos = None
+self._closed = True
+
+@property
+def closed(self):
+"""Read-only attribute specifying if the cursor is closed or not."""
+return self._closed
+
+@property
+def description(self):
+if self._signature is None:
+return None
+description = []
+for column in self._signature.columns:
+description.append(ColumnDescription(
+column.column_name,
+column.type.name,
+column.display_size,
+None,
+column.precision,
+column.scale,
+None if column.nullable == 2 else bool(column.nullable),
+))
+return description
+
+def _set_id(self, id):
+if self._id is not None and self._id != id:
+self._connection._client.close_statement(self._connection._id,
self._id)
+self._id = id
+
+def _set_signature(self, signature):
+self._signature = signature
+self._column_data_types = []
+self._parameter_data_types = []
+if signature is
