[phoenix] branch 4.x-HBase-1.3 updated: Remove deprecated APIs such as GlobalMetric#getTotalSum
This is an automated email from the ASF dual-hosted git repository.
skadam 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 d1e2f70 Remove deprecated APIs such as GlobalMetric#getTotalSum
d1e2f70 is described below
commit d1e2f70f54540aba0eb1215cb67bf808f54ee62b
Author: Xinyi
AuthorDate: Wed Apr 24 17:44:07 2019 -0700
Remove deprecated APIs such as GlobalMetric#getTotalSum
---
.../src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java | 6 --
.../main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java | 5 -
2 files changed, 11 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
index 2a4af86..1538065 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
@@ -29,10 +29,4 @@ public interface GlobalMetric extends Metric {
* @return Number of samples collected since the last {@link #reset()}
call.
*/
public long getNumberOfSamples();
-
-/**
- * @return Sum of the values of the metric sampled since the last {@link
#reset()} call.
- */
-@Deprecated
-public long getTotalSum();
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
index ce692f2..e8b1636 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
@@ -36,11 +36,6 @@ public class GlobalMetricImpl implements GlobalMetric {
}
@Override
-public long getTotalSum() {
-return metric.getValue();
-}
-
-@Override
public void change(long delta) {
metric.change(delta);
numberOfSamples.incrementAndGet();
[phoenix] branch 4.x-HBase-1.5 updated: Remove deprecated APIs such as GlobalMetric#getTotalSum
This is an automated email from the ASF dual-hosted git repository.
skadam 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 393dc53 Remove deprecated APIs such as GlobalMetric#getTotalSum
393dc53 is described below
commit 393dc53657840aae1ded3f866fa2f16e7fa37744
Author: Xinyi
AuthorDate: Wed Apr 24 17:44:07 2019 -0700
Remove deprecated APIs such as GlobalMetric#getTotalSum
---
.../src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java | 6 --
.../main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java | 5 -
.../java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java| 5 -
3 files changed, 16 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
index 2a4af86..1538065 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
@@ -29,10 +29,4 @@ public interface GlobalMetric extends Metric {
* @return Number of samples collected since the last {@link #reset()}
call.
*/
public long getNumberOfSamples();
-
-/**
- * @return Sum of the values of the metric sampled since the last {@link
#reset()} call.
- */
-@Deprecated
-public long getTotalSum();
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
index ba2d925..8c2128b 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
@@ -39,11 +39,6 @@ public class GlobalMetricImpl implements GlobalMetric {
}
@Override
-public long getTotalSum() {
-return metric.getValue();
-}
-
-@Override
public void change(long delta) {
metric.change(delta);
numberOfSamples.incrementAndGet();
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java
index 87216a4..2dfe941 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java
@@ -31,11 +31,6 @@ public class NoOpGlobalMetricImpl implements GlobalMetric {
}
@Override
-public long getTotalSum() {
-return NO_VALUE;
-}
-
-@Override
public MetricType getMetricType() {
return null;
}
[phoenix] branch 4.x-HBase-1.4 updated: Remove deprecated APIs such as GlobalMetric#getTotalSum
This is an automated email from the ASF dual-hosted git repository.
skadam 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 63edc86 Remove deprecated APIs such as GlobalMetric#getTotalSum
63edc86 is described below
commit 63edc868922d56f661dc0ccf396182d20165ed91
Author: Xinyi
AuthorDate: Wed Apr 24 17:44:07 2019 -0700
Remove deprecated APIs such as GlobalMetric#getTotalSum
---
.../src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java | 6 --
.../main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java | 5 -
.../java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java| 5 -
3 files changed, 16 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
index 2a4af86..1538065 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
@@ -29,10 +29,4 @@ public interface GlobalMetric extends Metric {
* @return Number of samples collected since the last {@link #reset()}
call.
*/
public long getNumberOfSamples();
-
-/**
- * @return Sum of the values of the metric sampled since the last {@link
#reset()} call.
- */
-@Deprecated
-public long getTotalSum();
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
index ba2d925..8c2128b 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
@@ -39,11 +39,6 @@ public class GlobalMetricImpl implements GlobalMetric {
}
@Override
-public long getTotalSum() {
-return metric.getValue();
-}
-
-@Override
public void change(long delta) {
metric.change(delta);
numberOfSamples.incrementAndGet();
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java
index 87216a4..2dfe941 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java
@@ -31,11 +31,6 @@ public class NoOpGlobalMetricImpl implements GlobalMetric {
}
@Override
-public long getTotalSum() {
-return NO_VALUE;
-}
-
-@Override
public MetricType getMetricType() {
return null;
}
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-4918 Apache Phoenix website Grammar page is running on an old version
This is an automated email from the ASF dual-hosted git repository.
skadam 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 5180f12 PHOENIX-4918 Apache Phoenix website Grammar page is running
on an old version
5180f12 is described below
commit 5180f12bacad4a470ccc62c2bad969eed1a28d44
Author: Xinyi Yan
AuthorDate: Mon Feb 25 19:07:49 2019 -0800
PHOENIX-4918 Apache Phoenix website Grammar page is running on an old
version
Signed-off-by: s.kadam
---
docs/phoenix.csv | 1479 --
1 file changed, 1326 insertions(+), 153 deletions(-)
diff --git a/docs/phoenix.csv b/docs/phoenix.csv
index 7f5fab8..d881e5e 100644
--- a/docs/phoenix.csv
+++ b/docs/phoenix.csv
@@ -1,42 +1,45 @@
"SECTION","TOPIC","SYNTAX","TEXT","EXAMPLE"
"Commands","SELECT","
-SELECT [/*+ hint */] [DISTINCT | ALL] selectExpression [,...]
-FROM tableExpression [( columnDef [,...] )] [ WHERE expression ]
-[ GROUP BY expression [,...] ] [ HAVING expression ]
+selectStatement [ { UNION ALL selectStatement [...] } ]
[ ORDER BY order [,...] ] [ LIMIT {bindParameter | number} ]
+[ OFFSET {bindParameter | number} [ ROW | ROWS ] ] [ FETCH { FIRST | NEXT }
{bindParameter | number} { ROW | ROWS } ONLY ]
","
-Selects data from a table.
-DISTINCT filters out duplicate results while ALL, the default, includes all
results.
-FROM identifies the table being queried (single table only currently - no
joins or derived tables yet).
-Dynamic columns not declared at create time may be defined in parenthesis
after the table name and then
-used in the query.
-GROUP BY groups the the result by the given expression(s).
-HAVING filter rows after grouping.
-ORDER BY sorts the result by the given column(s) or expression(s) and is only
allowed for aggregate
-queries or queries with a LIMIT clause.
-LIMIT limits the number of rows returned by the query with no limit applied if
specified as null or
-less than zero. The LIMIT clause is executed after the ORDER BY clause to
support TopN type queries.
-An optional hint overrides the default query plan.
+Selects data from one or more tables.
+UNION ALL combines rows from multiple select statements.
+ORDER BY sorts the result based on the given expressions.
+LIMIT(or FETCH FIRST) limits the number of rows returned by the query with no
limit applied if unspecified or specified
+as null or less than zero. The LIMIT(or FETCH FIRST) clause is executed after
the ORDER BY clause to support top-N type
+queries.
+OFFSET clause skips that many rows before beginning to return rows.
+An optional hint may be used to override decisions made by the query optimizer.
","
-SELECT * FROM TEST;
-SELECT a.* FROM TEST;
-SELECT DISTINCT NAME FROM TEST;
-SELECT ID, COUNT(1) FROM TEST GROUP BY ID;
-SELECT NAME, SUM(VAL) FROM TEST GROUP BY NAME HAVING COUNT(1) > 2;
-SELECT 'ID' COL, MAX(ID) AS MAX FROM TEST;
SELECT * FROM TEST LIMIT 1000;
+SELECT * FROM TEST LIMIT 1000 OFFSET 100;
+SELECT full_name FROM SALES_PERSON WHERE ranking >= 5.0
+UNION ALL SELECT reviewer_name FROM CUSTOMER_REVIEW WHERE score >= 8.0
"
+
"Commands","UPSERT VALUES","
UPSERT INTO tableName [( { columnRef | columnDef } [,...] )] VALUES (
constantTerm [,...] )
+[ON DUPLICATE KEY { IGNORE | UPDATE columnRef = operand } ]
","
Inserts if not present and updates otherwise the value in the table. The list
of
columns is optional and if not present, the values will map to the column in
the
order they are declared in the schema. The values must evaluate to constants.
+Use the ON DUPLICATE KEY clause (available in Phoenix 4.9) if you need the
UPSERT to be atomic. Performance
+will be slower in this case as the row needs to be read on the server side when
+the commit is done. Use IGNORE if you do not want the UPSERT performed if the
+row already exists. Otherwise, with UPDATE, the expression will be evaluated
and the
+result used to set the column, for example to perform an atomic increment. An
UPSERT
+to the same row in the same commit batch will be processed in the order of
execution.
+
","
UPSERT INTO TEST VALUES('foo','bar',3);
UPSERT INTO TEST(NAME,ID) VALUES('foo',123);
+UPSERT INTO TEST(ID, COUNTER) VALUES(123, 0) ON DUPLICATE KEY UPDATE COUNTER =
COUNTER + 1;
+UPSERT INTO TEST(ID, MY_COL) VALUES(123, 0) ON DUPLICATE KEY IGNORE;
"
"Commands","UPSERT SELECT","
UPSERT [/*+ hint */] INTO tableName [( { columnRef | columnDef } [,...] )]
select
@@ -68,49 +71,171 @@ DELETE FROM TEST WHERE ID=123;
DELETE FROM TEST WHERE NAME LIKE 'foo%';
"
-"Commands","CREATE","
-CREATE { TABLE | VIEW } [IF NOT EXISTS] tableRef
+"Commands"
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-4918 Apache Phoenix website Grammar page is running on an old version
This is an automated email from the ASF dual-hosted git repository.
skadam 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 8fc7006 PHOENIX-4918 Apache Phoenix website Grammar page is running
on an old version
8fc7006 is described below
commit 8fc7006d8aada0ad5ba43fba1fe16939da115b0d
Author: Xinyi Yan
AuthorDate: Mon Feb 25 19:07:49 2019 -0800
PHOENIX-4918 Apache Phoenix website Grammar page is running on an old
version
Signed-off-by: s.kadam
---
docs/phoenix.csv | 1479 --
1 file changed, 1326 insertions(+), 153 deletions(-)
diff --git a/docs/phoenix.csv b/docs/phoenix.csv
index 7f5fab8..d881e5e 100644
--- a/docs/phoenix.csv
+++ b/docs/phoenix.csv
@@ -1,42 +1,45 @@
"SECTION","TOPIC","SYNTAX","TEXT","EXAMPLE"
"Commands","SELECT","
-SELECT [/*+ hint */] [DISTINCT | ALL] selectExpression [,...]
-FROM tableExpression [( columnDef [,...] )] [ WHERE expression ]
-[ GROUP BY expression [,...] ] [ HAVING expression ]
+selectStatement [ { UNION ALL selectStatement [...] } ]
[ ORDER BY order [,...] ] [ LIMIT {bindParameter | number} ]
+[ OFFSET {bindParameter | number} [ ROW | ROWS ] ] [ FETCH { FIRST | NEXT }
{bindParameter | number} { ROW | ROWS } ONLY ]
","
-Selects data from a table.
-DISTINCT filters out duplicate results while ALL, the default, includes all
results.
-FROM identifies the table being queried (single table only currently - no
joins or derived tables yet).
-Dynamic columns not declared at create time may be defined in parenthesis
after the table name and then
-used in the query.
-GROUP BY groups the the result by the given expression(s).
-HAVING filter rows after grouping.
-ORDER BY sorts the result by the given column(s) or expression(s) and is only
allowed for aggregate
-queries or queries with a LIMIT clause.
-LIMIT limits the number of rows returned by the query with no limit applied if
specified as null or
-less than zero. The LIMIT clause is executed after the ORDER BY clause to
support TopN type queries.
-An optional hint overrides the default query plan.
+Selects data from one or more tables.
+UNION ALL combines rows from multiple select statements.
+ORDER BY sorts the result based on the given expressions.
+LIMIT(or FETCH FIRST) limits the number of rows returned by the query with no
limit applied if unspecified or specified
+as null or less than zero. The LIMIT(or FETCH FIRST) clause is executed after
the ORDER BY clause to support top-N type
+queries.
+OFFSET clause skips that many rows before beginning to return rows.
+An optional hint may be used to override decisions made by the query optimizer.
","
-SELECT * FROM TEST;
-SELECT a.* FROM TEST;
-SELECT DISTINCT NAME FROM TEST;
-SELECT ID, COUNT(1) FROM TEST GROUP BY ID;
-SELECT NAME, SUM(VAL) FROM TEST GROUP BY NAME HAVING COUNT(1) > 2;
-SELECT 'ID' COL, MAX(ID) AS MAX FROM TEST;
SELECT * FROM TEST LIMIT 1000;
+SELECT * FROM TEST LIMIT 1000 OFFSET 100;
+SELECT full_name FROM SALES_PERSON WHERE ranking >= 5.0
+UNION ALL SELECT reviewer_name FROM CUSTOMER_REVIEW WHERE score >= 8.0
"
+
"Commands","UPSERT VALUES","
UPSERT INTO tableName [( { columnRef | columnDef } [,...] )] VALUES (
constantTerm [,...] )
+[ON DUPLICATE KEY { IGNORE | UPDATE columnRef = operand } ]
","
Inserts if not present and updates otherwise the value in the table. The list
of
columns is optional and if not present, the values will map to the column in
the
order they are declared in the schema. The values must evaluate to constants.
+Use the ON DUPLICATE KEY clause (available in Phoenix 4.9) if you need the
UPSERT to be atomic. Performance
+will be slower in this case as the row needs to be read on the server side when
+the commit is done. Use IGNORE if you do not want the UPSERT performed if the
+row already exists. Otherwise, with UPDATE, the expression will be evaluated
and the
+result used to set the column, for example to perform an atomic increment. An
UPSERT
+to the same row in the same commit batch will be processed in the order of
execution.
+
","
UPSERT INTO TEST VALUES('foo','bar',3);
UPSERT INTO TEST(NAME,ID) VALUES('foo',123);
+UPSERT INTO TEST(ID, COUNTER) VALUES(123, 0) ON DUPLICATE KEY UPDATE COUNTER =
COUNTER + 1;
+UPSERT INTO TEST(ID, MY_COL) VALUES(123, 0) ON DUPLICATE KEY IGNORE;
"
"Commands","UPSERT SELECT","
UPSERT [/*+ hint */] INTO tableName [( { columnRef | columnDef } [,...] )]
select
@@ -68,49 +71,171 @@ DELETE FROM TEST WHERE ID=123;
DELETE FROM TEST WHERE NAME LIKE 'foo%';
"
-"Commands","CREATE","
-CREATE { TABLE | VIEW } [IF NOT EXISTS] tableRef
+"Commands"
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-4918 Apache Phoenix website Grammar page is running on an old version
This is an automated email from the ASF dual-hosted git repository.
skadam 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 dd317a4 PHOENIX-4918 Apache Phoenix website Grammar page is running
on an old version
dd317a4 is described below
commit dd317a403bd4beedd057af8d1300e4ba75d1139a
Author: Xinyi Yan
AuthorDate: Mon Feb 25 19:07:49 2019 -0800
PHOENIX-4918 Apache Phoenix website Grammar page is running on an old
version
Signed-off-by: s.kadam
---
docs/phoenix.csv | 1479 --
1 file changed, 1326 insertions(+), 153 deletions(-)
diff --git a/docs/phoenix.csv b/docs/phoenix.csv
index 7f5fab8..d881e5e 100644
--- a/docs/phoenix.csv
+++ b/docs/phoenix.csv
@@ -1,42 +1,45 @@
"SECTION","TOPIC","SYNTAX","TEXT","EXAMPLE"
"Commands","SELECT","
-SELECT [/*+ hint */] [DISTINCT | ALL] selectExpression [,...]
-FROM tableExpression [( columnDef [,...] )] [ WHERE expression ]
-[ GROUP BY expression [,...] ] [ HAVING expression ]
+selectStatement [ { UNION ALL selectStatement [...] } ]
[ ORDER BY order [,...] ] [ LIMIT {bindParameter | number} ]
+[ OFFSET {bindParameter | number} [ ROW | ROWS ] ] [ FETCH { FIRST | NEXT }
{bindParameter | number} { ROW | ROWS } ONLY ]
","
-Selects data from a table.
-DISTINCT filters out duplicate results while ALL, the default, includes all
results.
-FROM identifies the table being queried (single table only currently - no
joins or derived tables yet).
-Dynamic columns not declared at create time may be defined in parenthesis
after the table name and then
-used in the query.
-GROUP BY groups the the result by the given expression(s).
-HAVING filter rows after grouping.
-ORDER BY sorts the result by the given column(s) or expression(s) and is only
allowed for aggregate
-queries or queries with a LIMIT clause.
-LIMIT limits the number of rows returned by the query with no limit applied if
specified as null or
-less than zero. The LIMIT clause is executed after the ORDER BY clause to
support TopN type queries.
-An optional hint overrides the default query plan.
+Selects data from one or more tables.
+UNION ALL combines rows from multiple select statements.
+ORDER BY sorts the result based on the given expressions.
+LIMIT(or FETCH FIRST) limits the number of rows returned by the query with no
limit applied if unspecified or specified
+as null or less than zero. The LIMIT(or FETCH FIRST) clause is executed after
the ORDER BY clause to support top-N type
+queries.
+OFFSET clause skips that many rows before beginning to return rows.
+An optional hint may be used to override decisions made by the query optimizer.
","
-SELECT * FROM TEST;
-SELECT a.* FROM TEST;
-SELECT DISTINCT NAME FROM TEST;
-SELECT ID, COUNT(1) FROM TEST GROUP BY ID;
-SELECT NAME, SUM(VAL) FROM TEST GROUP BY NAME HAVING COUNT(1) > 2;
-SELECT 'ID' COL, MAX(ID) AS MAX FROM TEST;
SELECT * FROM TEST LIMIT 1000;
+SELECT * FROM TEST LIMIT 1000 OFFSET 100;
+SELECT full_name FROM SALES_PERSON WHERE ranking >= 5.0
+UNION ALL SELECT reviewer_name FROM CUSTOMER_REVIEW WHERE score >= 8.0
"
+
"Commands","UPSERT VALUES","
UPSERT INTO tableName [( { columnRef | columnDef } [,...] )] VALUES (
constantTerm [,...] )
+[ON DUPLICATE KEY { IGNORE | UPDATE columnRef = operand } ]
","
Inserts if not present and updates otherwise the value in the table. The list
of
columns is optional and if not present, the values will map to the column in
the
order they are declared in the schema. The values must evaluate to constants.
+Use the ON DUPLICATE KEY clause (available in Phoenix 4.9) if you need the
UPSERT to be atomic. Performance
+will be slower in this case as the row needs to be read on the server side when
+the commit is done. Use IGNORE if you do not want the UPSERT performed if the
+row already exists. Otherwise, with UPDATE, the expression will be evaluated
and the
+result used to set the column, for example to perform an atomic increment. An
UPSERT
+to the same row in the same commit batch will be processed in the order of
execution.
+
","
UPSERT INTO TEST VALUES('foo','bar',3);
UPSERT INTO TEST(NAME,ID) VALUES('foo',123);
+UPSERT INTO TEST(ID, COUNTER) VALUES(123, 0) ON DUPLICATE KEY UPDATE COUNTER =
COUNTER + 1;
+UPSERT INTO TEST(ID, MY_COL) VALUES(123, 0) ON DUPLICATE KEY IGNORE;
"
"Commands","UPSERT SELECT","
UPSERT [/*+ hint */] INTO tableName [( { columnRef | columnDef } [,...] )]
select
@@ -68,49 +71,171 @@ DELETE FROM TEST WHERE ID=123;
DELETE FROM TEST WHERE NAME LIKE 'foo%';
"
-"Commands","CREATE","
-CREATE { TABLE | VIEW } [IF NOT EXISTS] tableRef
+"Commands"
[phoenix] branch master updated: PHOENIX-4918 Apache Phoenix website Grammar page is running on an old version
This is an automated email from the ASF dual-hosted git repository.
skadam 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 2b78270 PHOENIX-4918 Apache Phoenix website Grammar page is running
on an old version
2b78270 is described below
commit 2b782708c2b2476495d4682fdcd727dc4f930222
Author: Xinyi Yan
AuthorDate: Mon Feb 25 19:07:49 2019 -0800
PHOENIX-4918 Apache Phoenix website Grammar page is running on an old
version
Signed-off-by: s.kadam
---
docs/phoenix.csv | 1479 --
1 file changed, 1326 insertions(+), 153 deletions(-)
diff --git a/docs/phoenix.csv b/docs/phoenix.csv
index 7f5fab8..d881e5e 100644
--- a/docs/phoenix.csv
+++ b/docs/phoenix.csv
@@ -1,42 +1,45 @@
"SECTION","TOPIC","SYNTAX","TEXT","EXAMPLE"
"Commands","SELECT","
-SELECT [/*+ hint */] [DISTINCT | ALL] selectExpression [,...]
-FROM tableExpression [( columnDef [,...] )] [ WHERE expression ]
-[ GROUP BY expression [,...] ] [ HAVING expression ]
+selectStatement [ { UNION ALL selectStatement [...] } ]
[ ORDER BY order [,...] ] [ LIMIT {bindParameter | number} ]
+[ OFFSET {bindParameter | number} [ ROW | ROWS ] ] [ FETCH { FIRST | NEXT }
{bindParameter | number} { ROW | ROWS } ONLY ]
","
-Selects data from a table.
-DISTINCT filters out duplicate results while ALL, the default, includes all
results.
-FROM identifies the table being queried (single table only currently - no
joins or derived tables yet).
-Dynamic columns not declared at create time may be defined in parenthesis
after the table name and then
-used in the query.
-GROUP BY groups the the result by the given expression(s).
-HAVING filter rows after grouping.
-ORDER BY sorts the result by the given column(s) or expression(s) and is only
allowed for aggregate
-queries or queries with a LIMIT clause.
-LIMIT limits the number of rows returned by the query with no limit applied if
specified as null or
-less than zero. The LIMIT clause is executed after the ORDER BY clause to
support TopN type queries.
-An optional hint overrides the default query plan.
+Selects data from one or more tables.
+UNION ALL combines rows from multiple select statements.
+ORDER BY sorts the result based on the given expressions.
+LIMIT(or FETCH FIRST) limits the number of rows returned by the query with no
limit applied if unspecified or specified
+as null or less than zero. The LIMIT(or FETCH FIRST) clause is executed after
the ORDER BY clause to support top-N type
+queries.
+OFFSET clause skips that many rows before beginning to return rows.
+An optional hint may be used to override decisions made by the query optimizer.
","
-SELECT * FROM TEST;
-SELECT a.* FROM TEST;
-SELECT DISTINCT NAME FROM TEST;
-SELECT ID, COUNT(1) FROM TEST GROUP BY ID;
-SELECT NAME, SUM(VAL) FROM TEST GROUP BY NAME HAVING COUNT(1) > 2;
-SELECT 'ID' COL, MAX(ID) AS MAX FROM TEST;
SELECT * FROM TEST LIMIT 1000;
+SELECT * FROM TEST LIMIT 1000 OFFSET 100;
+SELECT full_name FROM SALES_PERSON WHERE ranking >= 5.0
+UNION ALL SELECT reviewer_name FROM CUSTOMER_REVIEW WHERE score >= 8.0
"
+
"Commands","UPSERT VALUES","
UPSERT INTO tableName [( { columnRef | columnDef } [,...] )] VALUES (
constantTerm [,...] )
+[ON DUPLICATE KEY { IGNORE | UPDATE columnRef = operand } ]
","
Inserts if not present and updates otherwise the value in the table. The list
of
columns is optional and if not present, the values will map to the column in
the
order they are declared in the schema. The values must evaluate to constants.
+Use the ON DUPLICATE KEY clause (available in Phoenix 4.9) if you need the
UPSERT to be atomic. Performance
+will be slower in this case as the row needs to be read on the server side when
+the commit is done. Use IGNORE if you do not want the UPSERT performed if the
+row already exists. Otherwise, with UPDATE, the expression will be evaluated
and the
+result used to set the column, for example to perform an atomic increment. An
UPSERT
+to the same row in the same commit batch will be processed in the order of
execution.
+
","
UPSERT INTO TEST VALUES('foo','bar',3);
UPSERT INTO TEST(NAME,ID) VALUES('foo',123);
+UPSERT INTO TEST(ID, COUNTER) VALUES(123, 0) ON DUPLICATE KEY UPDATE COUNTER =
COUNTER + 1;
+UPSERT INTO TEST(ID, MY_COL) VALUES(123, 0) ON DUPLICATE KEY IGNORE;
"
"Commands","UPSERT SELECT","
UPSERT [/*+ hint */] INTO tableName [( { columnRef | columnDef } [,...] )]
select
@@ -68,49 +71,171 @@ DELETE FROM TEST WHERE ID=123;
DELETE FROM TEST WHERE NAME LIKE 'foo%';
"
-"Commands","CREATE","
-CREATE { TABLE | VIEW } [IF NOT EXISTS] tableRef
+"Commands","DECL
[phoenix] branch master updated: PHOENIX-5183 Remove deprecated APIs such as GlobalMetric#getTotalSum (#492)
This is an automated email from the ASF dual-hosted git repository.
skadam 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 0d3184d PHOENIX-5183 Remove deprecated APIs such as
GlobalMetric#getTotalSum (#492)
0d3184d is described below
commit 0d3184d5ce0d0a757c21bd16453110270bc4e879
Author: Xinyi Yan
AuthorDate: Thu May 30 12:05:29 2019 -0700
PHOENIX-5183 Remove deprecated APIs such as GlobalMetric#getTotalSum (#492)
---
.../src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java | 6 --
.../main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java | 5 -
.../java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java| 5 -
3 files changed, 16 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
index 2a4af86..1538065 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
@@ -29,10 +29,4 @@ public interface GlobalMetric extends Metric {
* @return Number of samples collected since the last {@link #reset()}
call.
*/
public long getNumberOfSamples();
-
-/**
- * @return Sum of the values of the metric sampled since the last {@link
#reset()} call.
- */
-@Deprecated
-public long getTotalSum();
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
index ba2d925..8c2128b 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricImpl.java
@@ -39,11 +39,6 @@ public class GlobalMetricImpl implements GlobalMetric {
}
@Override
-public long getTotalSum() {
-return metric.getValue();
-}
-
-@Override
public void change(long delta) {
metric.change(delta);
numberOfSamples.incrementAndGet();
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java
index 87216a4..2dfe941 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/NoOpGlobalMetricImpl.java
@@ -31,11 +31,6 @@ public class NoOpGlobalMetricImpl implements GlobalMetric {
}
@Override
-public long getTotalSum() {
-return NO_VALUE;
-}
-
-@Override
public MetricType getMetricType() {
return null;
}
svn commit: r1860865 [4/4] - in /phoenix/site: publish/array_type.html publish/language/datatypes.html publish/language/functions.html publish/language/index.html source/src/site/markdown/array_type.m
Modified: phoenix/site/source/src/site/markdown/array_type.md URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/array_type.md?rev=1860865=1860864=1860865=diff == --- phoenix/site/source/src/site/markdown/array_type.md (original) +++ phoenix/site/source/src/site/markdown/array_type.md Sat Jun 8 22:17:46 2019 @@ -3,16 +3,14 @@ The Apache Phoenix 3.0/4.0 release introduces support for the [JDBC ARRAY type](http://docs.oracle.com/javase/tutorial/jdbc/basics/array.html). Any primitive type may be used in an ARRAY. Here is an example of declaring an array type when creating a table: CREATE TABLE regions ( -region_name VARCHAR PRIMARY KEY, -zips VARCHAR ARRAY[10], -CONSTRAINT pk PRIMARY KEY (region_name)); +region_name VARCHAR NOT NULL PRIMARY KEY, +zips VARCHAR ARRAY[10]); or alternately: CREATE TABLE regions ( -region_name VARCHAR PRIMARY KEY, -zips VARCHAR[], -CONSTRAINT pk PRIMARY KEY (region_name)); +region_name VARCHAR NOT NULL PRIMARY KEY, +zips VARCHAR[]); Insertion into the array may be done entirely through a SQL statement: @@ -34,11 +32,11 @@ The entire array may be selected: or an individual element in the array may be accessed via a subscript notation. The subscript is one-based, so the following would select the first element: -SELECT zip[1] FROM regions WHERE region_name = 'SF Bay Area'; +SELECT zips[1] FROM regions WHERE region_name = 'SF Bay Area'; Use of the array subscript notation is supported in other expressions as well, for example in a WHERE clause: -SELECT region_name FROM regions WHERE zip[1] = '94030' OR zip[2] = '94030' OR zip[3] = '94030'; +SELECT region_name FROM regions WHERE zips[1] = '94030' OR zips[2] = '94030' OR zips[3] = '94030'; The length of the array grows dynamically as needed with the current length and is accessible through the ARRAY_LENGTH build it function: @@ -48,16 +46,16 @@ Attempts to access an array element beyo For searching in an array, built-in functions like ANY and ALL are provided. For example, -SELECT region_name FROM regions WHERE '94030' = ANY(zip); -SELECT region_name FROM regions WHERE '94030' = ALL(zip); +SELECT region_name FROM regions WHERE '94030' = ANY(zips); +SELECT region_name FROM regions WHERE '94030' = ALL(zips); The built-in function ANY checks if any of the element in the array satisfies the condition and it is equivalent to OR condition: -SELECT region_name FROM regions WHERE zip[1] = '94030' OR zip[2] = '94030' OR zip[3] = '94030'; +SELECT region_name FROM regions WHERE zips[1] = '94030' OR zips[2] = '94030' OR zips[3] = '94030'; The built-in function ALL checks if all the elements in the array satisfies the condition and it is equivalent to AND condition: -SELECT region_name FROM regions WHERE zip[1] = '94030' AND zip[2] = '94030' AND zip[3] = '94030'; +SELECT region_name FROM regions WHERE zips[1] = '94030' AND zips[2] = '94030' AND zips[3] = '94030';
svn commit: r1860865 [2/4] - in /phoenix/site: publish/array_type.html publish/language/datatypes.html publish/language/functions.html publish/language/index.html source/src/site/markdown/array_type.m
Modified: phoenix/site/publish/language/functions.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1860865=1860864=1860865=diff
==
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Sat Jun 8 22:17:46 2019
@@ -1,7 +1,7 @@
@@ -165,1886 +165,7 @@
Functions
-
-
-
-Aggregate Functions
-
-
-
-
-
-
-AVG
-
-COUNT
-
-APPROX_COUNT_DISTINCT
-
-MAX
-
-MIN
-
-SUM
-
-
-PERCENTILE_CONT
-
-PERCENTILE_DISC
-
-PERCENT_RANK
-
-FIRST_VALUE
-
-LAST_VALUE
-
-FIRST_VALUES
-
-
-LAST_VALUES
-
-NTH_VALUE
-
-STDDEV_POP
-
-STDDEV_SAMP
-
-
-
-
-
-String Functions
-
-
-
-
-
-
-SUBSTR
-
-INSTR
-
-TRIM
-
-LTRIM
-
-RTRIM
-
-
-LPAD
-
-LENGTH
-
-REGEXP_SUBSTR
-
-REGEXP_REPLACE
-
-REGEXP_SPLIT
-
-
-UPPER
-
-LOWER
-
-REVERSE
-
-TO_CHAR
-
-COLLATION_KEY
-
-
-
-
-
-Time and Date Functions
-
-
-
-
-
-
-TO_DATE
-
-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
svn commit: r1860865 [1/4] - in /phoenix/site: publish/array_type.html publish/language/datatypes.html publish/language/functions.html publish/language/index.html source/src/site/markdown/array_type.m
Author: skadam Date: Sat Jun 8 22:17:46 2019 New Revision: 1860865 URL: http://svn.apache.org/viewvc?rev=1860865=rev Log: Doc: Fix incorrect DDL and DML (In ARRAY Type page) Modified: phoenix/site/publish/array_type.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/array_type.md Modified: phoenix/site/publish/array_type.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/array_type.html?rev=1860865=1860864=1860865=diff == --- phoenix/site/publish/array_type.html (original) +++ phoenix/site/publish/array_type.html Sat Jun 8 22:17:46 2019 @@ -169,17 +169,15 @@ The Apache Phoenix 3.0/4.0 release introduces support for the http://docs.oracle.com/javase/tutorial/jdbc/basics/array.html;>JDBC ARRAY type. Any primitive type may be used in an ARRAY. Here is an example of declaring an array type when creating a table: CREATE TABLE regions ( -region_name VARCHAR PRIMARY KEY, -zips VARCHAR ARRAY[10], -CONSTRAINT pk PRIMARY KEY (region_name)); +region_name VARCHAR NOT NULL PRIMARY KEY, +zips VARCHAR ARRAY[10]); or alternately: CREATE TABLE regions ( -region_name VARCHAR PRIMARY KEY, -zips VARCHAR[], -CONSTRAINT pk PRIMARY KEY (region_name)); +region_name VARCHAR NOT NULL PRIMARY KEY, +zips VARCHAR[]); Insertion into the array may be done entirely through a SQL statement: @@ -205,12 +203,12 @@ stmt.execute(); or an individual element in the array may be accessed via a subscript notation. The subscript is one-based, so the following would select the first element: - SELECT zip[1] FROM regions WHERE region_name = 'SF Bay Area'; + SELECT zips[1] FROM regions WHERE region_name = 'SF Bay Area'; Use of the array subscript notation is supported in other expressions as well, for example in a WHERE clause: - SELECT region_name FROM regions WHERE zip[1] = '94030' OR zip[2] = '94030' OR zip[3] = '94030'; + SELECT region_name FROM regions WHERE zips[1] = '94030' OR zips[2] = '94030' OR zips[3] = '94030'; The length of the array grows dynamically as needed with the current length and is accessible through the ARRAY_LENGTH build it function: @@ -221,18 +219,18 @@ stmt.execute(); Attempts to access an array element beyond the current length will evaluate to null. For searching in an array, built-in functions like ANY and ALL are provided. For example, - SELECT region_name FROM regions WHERE '94030' = ANY(zip); -SELECT region_name FROM regions WHERE '94030' = ALL(zip); + SELECT region_name FROM regions WHERE '94030' = ANY(zips); +SELECT region_name FROM regions WHERE '94030' = ALL(zips); The built-in function ANY checks if any of the element in the array satisfies the condition and it is equivalent to OR condition: - SELECT region_name FROM regions WHERE zip[1] = '94030' OR zip[2] = '94030' OR zip[3] = '94030'; + SELECT region_name FROM regions WHERE zips[1] = '94030' OR zips[2] = '94030' OR zips[3] = '94030'; The built-in function ALL checks if all the elements in the array satisfies the condition and it is equivalent to AND condition: - SELECT region_name FROM regions WHERE zip[1] = '94030' AND zip[2] = '94030' AND zip[3] = '94030'; + SELECT region_name FROM regions WHERE zips[1] = '94030' AND zips[2] = '94030' AND zips[3] = '94030'; Modified: phoenix/site/publish/language/datatypes.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1860865=1860864=1860865=diff == --- phoenix/site/publish/language/datatypes.html (original) +++ phoenix/site/publish/language/datatypes.html Sat Jun 8 22:17:46 2019 @@ -1,7 +1,7 @@ @@ -165,579 +165,7 @@ Data Types - - - -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 T
svn commit: r1860865 [3/4] - in /phoenix/site: publish/array_type.html publish/language/datatypes.html publish/language/functions.html publish/language/index.html source/src/site/markdown/array_type.m
Modified: phoenix/site/publish/language/index.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1860865=1860864=1860865=diff
==
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Sat Jun 8 22:17:46 2019
@@ -1,7 +1,7 @@
@@ -165,1678 +165,7 @@
Grammar
-
-
-
-Commands
-
-
-
-
-
-
-SELECT
-
-UPSERT VALUES
-
-UPSERT SELECT
-
-DELETE
-
-DECLARE CURSOR
-
-OPEN CURSOR
-
-FETCH NEXT
-
-CLOSE
-
-CREATE TABLE
-
-
-DROP TABLE
-
-CREATE FUNCTION
-
-DROP FUNCTION
-
-CREATE VIEW
-
-DROP VIEW
-
-CREATE SEQUENCE
-
-DROP SEQUENCE
-
-ALTER
-
-CREATE INDEX
-
-
-DROP INDEX
-
-ALTER INDEX
-
-EXPLAIN
-
-UPDATE STATISTICS
-
-CREATE SCHEMA
-
-USE
-
-DROP SCHEMA
-
-GRANT
-
-REVOKE
-
-
-
-
-
-Other Grammar
-
-
-
-
-
-
-Constraint
-
-Options
-
-Hint
-
-Scan Hint
-
-Cache Hint
-
-Index Hint
-
-Small Hint
-
-Seek To Column Hint
-
-Join Hint
-
-Serial Hint
-
-Column Def
-
-Table Ref
-
-Sequence Ref
-
-Column Ref
-
-Select Expression
-
-Select Statement
-
-Split Point
-
-Table Spec
-
-Aliased Table Ref
-
-
-Join Type
-
-Func Argument
-
-Class Name
-
-Jar Path
-
-Order
-
-Expression
-
-And Condition
-
-Boolean Condition
-
-Condition
-
-RHS Operand
-
-Operand
-
-Summand
-
-Factor
-
-Term
-
-Array Constructor
-
-Sequence
-
-Cast
-
-Row Value Constructor
-
-Bind Parameter
-
-
-Value
-
-Case
-
-Case When
-
-Name
-
-Quoted Name
-
-Alias
-
-Null
-
-Data Type
-
-SQL Data Type
-
-HBase Data Type
-
-String
-
-Boolean
-
-Numeric
-
-Int
-
-Long
-
-Decimal
-
-Number
-
-Comments
-
-
-
-
-
-
-SELECT
-
-
-selectStatement [ { UNION ALL selectStatement [...] } ]
-[ ORDER BY order [,...] ] [ LIMIT {bindParameter | number} ]
-[ OFFSET {bindParameter | number} [ ROW | ROWS ] ] [ FETCH { FIRST | NEXT }
{bindParameter | number} { ROW | ROWS } ONLY ]
-
-
-selectStatementUNION ALL selectStatement...ORDER BY order, ...LIMITbindParameter<
/td>numberOFFSETbindParameternumber<
/td>ROWROWSFETCHFIRSTNEXTbindParameternumberROWROWSONLY
-
-
-
-Selects data from one or more tables. UNION ALL combines rows
from multiple select statements. ORDER BY sorts the result based
on the given expressions. LIMIT(or FETCH FIRST)
limits the number of rows returned by the query with no limit applied if
unspecified or specified as null or less than zero. The LIMIT(or
FETCH FIRST) clause is executed after the ORDER BY
clause to support top-N type queries.
svn propchange: r1860865 - svn:log
Author: skadam Revision: 1860865 Modified property: svn:log Modified: svn:log at Sat Jun 8 22:28:19 2019 -- --- svn:log (original) +++ svn:log Sat Jun 8 22:28:19 2019 @@ -1 +1 @@ -Doc: Fix incorrect DDL and DML (In ARRAY Type page) +Doc: Fix incorrect DDL and DML (In ARRAY Type page) (Karthik Palanisamy)
svn commit: r1859050 - in /phoenix/site: publish/team.html source/src/site/markdown/team.md
Author: skadam Date: Fri May 10 02:07:35 2019 New Revision: 1859050 URL: http://svn.apache.org/viewvc?rev=1859050=rev Log: Fix bad commit. Modified: phoenix/site/publish/team.html phoenix/site/source/src/site/markdown/team.md Modified: phoenix/site/publish/team.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/team.html?rev=1859050=1859049=1859050=diff == --- phoenix/site/publish/team.html (original) +++ phoenix/site/publish/team.html Fri May 10 02:07:35 2019 @@ -1,7 +1,7 @@ @@ -358,66 +358,60 @@ PMC - Abhishek Singh Chouhan - Salesforce - mailto:achou...@apache.org;>achou...@apache.org - Committer - - Akshita Malhotra Salesforce mailto:akshitamalho...@apache.org;>akshitamalho...@apache.org Committer - + Chinmay Kulkarni Salesforce mailto:chinmayskulka...@apache.org;>chinmayskulka...@apache.org Committer - + Cody Marcel Salesforce mailto:codymar...@apache.org;>codymar...@apache.org Committer - + Dumindu Buddhika University of Moratuwa mailto:dumin...@apache.org;>dumin...@apache.org Committer - + Ethan Wang Facebook mailto:ew...@apache.org;>ew...@apache.org Committer - + Gerald Sangudi 23andme mailto:sang...@apache.org;>sang...@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 - + Kevin Liew Simba Technologies mailto:kl...@apache.org;>kl...@apache.org Committer - + Ohad Shacham Yahoo Research, Oath mailto:oh...@apache.org;>oh...@apache.org Modified: phoenix/site/source/src/site/markdown/team.md URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/team.md?rev=1859050=1859049=1859050=diff == --- phoenix/site/source/src/site/markdown/team.md (original) +++ phoenix/site/source/src/site/markdown/team.md Fri May 10 02:07:35 2019 @@ -37,7 +37,6 @@ Simon Toens | Salesforce | stoens@apache Steven Noels | NGDATA | stev...@apache.org | PMC Thomas D'Silva | Salesforce | tdsi...@apache.org | PMC Vincent Poon | Salesforce | vincentp...@apache.org | PMC -Abhishek Singh Chouhan | Salesforce | achou...@apache.org | Committer Akshita Malhotra | Salesforce | akshitamalho...@apache.org | Committer Chinmay Kulkarni | Salesforce | chinmayskulka...@apache.org | Committer Cody Marcel | Salesforce | codymar...@apache.org | Committer
svn commit: r1859049 - /phoenix/site/source/src/site/markdown/team.md
Author: skadam Date: Fri May 10 01:24:04 2019 New Revision: 1859049 URL: http://svn.apache.org/viewvc?rev=1859049=rev Log: Adding new committers Modified: phoenix/site/source/src/site/markdown/team.md Modified: phoenix/site/source/src/site/markdown/team.md URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/team.md?rev=1859049=1859048=1859049=diff == --- phoenix/site/source/src/site/markdown/team.md (original) +++ phoenix/site/source/src/site/markdown/team.md Fri May 10 01:24:04 2019 @@ -46,5 +46,8 @@ Ethan Wang | Facebook | ew...@apache.org Gerald Sangudi | 23andme | sang...@apache.org | Committer Jaanai Zhang | Alibaba | jaa...@apache.org | Committer Jan Fernando | Salesforce | jferna...@apache.org | Committer +Kadir Ozdemir | Salesforce | ka...@apache.org | Committer Kevin Liew | Simba Technologies | kl...@apache.org | Committer +Mihir Monani | Salesforce | mihir6...@apache.org | Committer +Swaroopa Kadam | Salesforce | ska...@apache.org | Committer Ohad Shacham | Yahoo Research, Oath | oh...@apache.org | Committer
svn commit: r1859051 - in /phoenix/site: publish/team.html source/src/site/markdown/team.md
Author: skadam Date: Fri May 10 02:51:20 2019 New Revision: 1859051 URL: http://svn.apache.org/viewvc?rev=1859051=rev Log: Added new committers to the team page. Modified: phoenix/site/publish/team.html phoenix/site/source/src/site/markdown/team.md Modified: phoenix/site/publish/team.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/team.html?rev=1859051=1859050=1859051=diff == --- phoenix/site/publish/team.html (original) +++ phoenix/site/publish/team.html Fri May 10 02:51:20 2019 @@ -1,7 +1,7 @@ @@ -358,53 +358,65 @@ PMC + Abhishek Singh Chouhan + Salesforce + mailto:achou...@apache.org;>achou...@apache.org + Committer + + Akshita Malhotra Salesforce mailto:akshitamalho...@apache.org;>akshitamalho...@apache.org Committer - + Chinmay Kulkarni Salesforce mailto:chinmayskulka...@apache.org;>chinmayskulka...@apache.org Committer - + Cody Marcel Salesforce mailto:codymar...@apache.org;>codymar...@apache.org Committer - + Dumindu Buddhika University of Moratuwa mailto:dumin...@apache.org;>dumin...@apache.org Committer - + Ethan Wang Facebook mailto:ew...@apache.org;>ew...@apache.org Committer - + Gerald Sangudi 23andme mailto:sang...@apache.org;>sang...@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 @@ -412,6 +424,18 @@ 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/team.md URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/team.md?rev=1859051=1859050=1859051=diff == --- phoenix/site/source/src/site/markdown/team.md (original) +++ phoenix/site/source/src/site/markdown/team.md Fri May 10 02:51:20 2019 @@ -37,6 +37,7 @@ Simon Toens | Salesforce | stoens@apache Steven Noels | NGDATA | stev...@apache.org | PMC Thomas D'Silva | Salesforce | tdsi...@apache.org | PMC Vincent Poon | Salesforce | vincentp...@apache.org | PMC +Abhishek Singh Chouhan | Salesforce | achou...@apache.org | Committer Akshita Malhotra | Salesforce | akshitamalho...@apache.org | Committer Chinmay Kulkarni | Salesforce | chinmayskulka...@apache.org | Committer Cody Marcel | Salesforce | codymar...@apache.org | Committer
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5359: Remove (Global-Indexing)new coprocessors in CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
This is an automated email from the ASF dual-hosted git repository.
skadam 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 8ff8cce PHOENIX-5359: Remove (Global-Indexing)new coprocessors in
CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
8ff8cce is described below
commit 8ff8cce7fff659b9d3a34fc43e0360dec84391ac
Author: s.kadam
AuthorDate: Thu Jun 20 11:58:55 2019 -0700
PHOENIX-5359: Remove (Global-Indexing)new coprocessors in
CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
---
.../apache/phoenix/query/ConnectionQueryServicesImpl.java | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 3a6..258e676 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -899,12 +899,14 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
TransactionFactory.Provider provider =
getTransactionProvider(tableProps);
boolean isTransactional = (provider != null);
-boolean globalIndexerEnabled = config.getBoolean(
+boolean indexRegionObserverEnabled = config.getBoolean(
QueryServices.INDEX_REGION_OBSERVER_ENABLED_ATTRIB,
QueryServicesOptions.DEFAULT_INDEX_REGION_OBSERVER_ENABLED);
if (tableType == PTableType.INDEX && !isTransactional) {
-if (globalIndexerEnabled &&
!descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
+if (!indexRegionObserverEnabled &&
descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
+
descriptor.removeCoprocessor(GlobalIndexChecker.class.getName());
+} else if (indexRegionObserverEnabled &&
!descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
descriptor.addCoprocessor(GlobalIndexChecker.class.getName(), null, priority -
1, null);
}
}
@@ -945,7 +947,10 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
if
(descriptor.hasCoprocessor(PhoenixTransactionalIndexer.class.getName())) {
descriptor.removeCoprocessor(PhoenixTransactionalIndexer.class.getName());
}
-if (globalIndexerEnabled) {
+if (indexRegionObserverEnabled) {
+if
(descriptor.hasCoprocessor(Indexer.class.getName())) {
+
descriptor.removeCoprocessor(Indexer.class.getName());
+}
if
(!descriptor.hasCoprocessor(IndexRegionObserver.class.getName())) {
Map opts =
Maps.newHashMapWithExpectedSize(1);
opts.put(NonTxIndexBuilder.CODEC_CLASS_NAME_KEY,
PhoenixIndexCodec.class.getName());
@@ -953,6 +958,9 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
}
} else {
+if
(descriptor.hasCoprocessor(IndexRegionObserver.class.getName())) {
+
descriptor.removeCoprocessor(IndexRegionObserver.class.getName());
+}
if
(!descriptor.hasCoprocessor(Indexer.class.getName())) {
Map opts =
Maps.newHashMapWithExpectedSize(1);
opts.put(NonTxIndexBuilder.CODEC_CLASS_NAME_KEY,
PhoenixIndexCodec.class.getName());
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5359: Remove (Global-Indexing)new coprocessors in CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
This is an automated email from the ASF dual-hosted git repository.
skadam 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 066d86b PHOENIX-5359: Remove (Global-Indexing)new coprocessors in
CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
066d86b is described below
commit 066d86bb30ef8e8cb7bb40fc9d5ea4fd8e41739b
Author: s.kadam
AuthorDate: Thu Jun 20 11:58:55 2019 -0700
PHOENIX-5359: Remove (Global-Indexing)new coprocessors in
CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
---
.../apache/phoenix/query/ConnectionQueryServicesImpl.java | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 3a6..258e676 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -899,12 +899,14 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
TransactionFactory.Provider provider =
getTransactionProvider(tableProps);
boolean isTransactional = (provider != null);
-boolean globalIndexerEnabled = config.getBoolean(
+boolean indexRegionObserverEnabled = config.getBoolean(
QueryServices.INDEX_REGION_OBSERVER_ENABLED_ATTRIB,
QueryServicesOptions.DEFAULT_INDEX_REGION_OBSERVER_ENABLED);
if (tableType == PTableType.INDEX && !isTransactional) {
-if (globalIndexerEnabled &&
!descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
+if (!indexRegionObserverEnabled &&
descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
+
descriptor.removeCoprocessor(GlobalIndexChecker.class.getName());
+} else if (indexRegionObserverEnabled &&
!descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
descriptor.addCoprocessor(GlobalIndexChecker.class.getName(), null, priority -
1, null);
}
}
@@ -945,7 +947,10 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
if
(descriptor.hasCoprocessor(PhoenixTransactionalIndexer.class.getName())) {
descriptor.removeCoprocessor(PhoenixTransactionalIndexer.class.getName());
}
-if (globalIndexerEnabled) {
+if (indexRegionObserverEnabled) {
+if
(descriptor.hasCoprocessor(Indexer.class.getName())) {
+
descriptor.removeCoprocessor(Indexer.class.getName());
+}
if
(!descriptor.hasCoprocessor(IndexRegionObserver.class.getName())) {
Map opts =
Maps.newHashMapWithExpectedSize(1);
opts.put(NonTxIndexBuilder.CODEC_CLASS_NAME_KEY,
PhoenixIndexCodec.class.getName());
@@ -953,6 +958,9 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
}
} else {
+if
(descriptor.hasCoprocessor(IndexRegionObserver.class.getName())) {
+
descriptor.removeCoprocessor(IndexRegionObserver.class.getName());
+}
if
(!descriptor.hasCoprocessor(Indexer.class.getName())) {
Map opts =
Maps.newHashMapWithExpectedSize(1);
opts.put(NonTxIndexBuilder.CODEC_CLASS_NAME_KEY,
PhoenixIndexCodec.class.getName());
[phoenix] branch master updated: PHOENIX-5359: Remove (Global-Indexing)new coprocessors in CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled (#522)
This is an automated email from the ASF dual-hosted git repository.
skadam 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 c4d75dd PHOENIX-5359: Remove (Global-Indexing)new coprocessors in
CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
(#522)
c4d75dd is described below
commit c4d75ddeb5134e245dbe9019481758f81fb30e9d
Author: Swaroopa Kadam
AuthorDate: Wed Jun 26 13:40:24 2019 -0700
PHOENIX-5359: Remove (Global-Indexing)new coprocessors in
CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
(#522)
---
.../apache/phoenix/query/ConnectionQueryServicesImpl.java | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index e2eb079..133737f 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -906,12 +906,14 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
TransactionFactory.Provider provider =
getTransactionProvider(tableProps);
boolean isTransactional = (provider != null);
-boolean globalIndexerEnabled = config.getBoolean(
+boolean indexRegionObserverEnabled = config.getBoolean(
QueryServices.INDEX_REGION_OBSERVER_ENABLED_ATTRIB,
QueryServicesOptions.DEFAULT_INDEX_REGION_OBSERVER_ENABLED);
if (tableType == PTableType.INDEX && !isTransactional) {
-if (globalIndexerEnabled &&
!newDesc.hasCoprocessor(GlobalIndexChecker.class.getName())) {
+if (!indexRegionObserverEnabled &&
newDesc.hasCoprocessor(GlobalIndexChecker.class.getName())) {
+
builder.removeCoprocessor(GlobalIndexChecker.class.getName());
+} else if (indexRegionObserverEnabled &&
!newDesc.hasCoprocessor(GlobalIndexChecker.class.getName())) {
builder.addCoprocessor(GlobalIndexChecker.class.getName(),
null, priority - 1, null);
}
}
@@ -952,14 +954,19 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
if
(newDesc.hasCoprocessor(PhoenixTransactionalIndexer.class.getName())) {
builder.removeCoprocessor(PhoenixTransactionalIndexer.class.getName());
}
-if (globalIndexerEnabled) {
+if (indexRegionObserverEnabled) {
+if (newDesc.hasCoprocessor(Indexer.class.getName())) {
+builder.removeCoprocessor(Indexer.class.getName());
+}
if
(!newDesc.hasCoprocessor(IndexRegionObserver.class.getName())) {
Map opts =
Maps.newHashMapWithExpectedSize(1);
opts.put(NonTxIndexBuilder.CODEC_CLASS_NAME_KEY,
PhoenixIndexCodec.class.getName());
IndexRegionObserver.enableIndexing(builder,
PhoenixIndexBuilder.class, opts, priority);
}
-
} else {
+if
(newDesc.hasCoprocessor(IndexRegionObserver.class.getName())) {
+
builder.removeCoprocessor(IndexRegionObserver.class.getName());
+}
if (!newDesc.hasCoprocessor(Indexer.class.getName())) {
Map opts =
Maps.newHashMapWithExpectedSize(1);
opts.put(NonTxIndexBuilder.CODEC_CLASS_NAME_KEY,
PhoenixIndexCodec.class.getName());
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5359: Remove (Global-Indexing)new coprocessors in CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
This is an automated email from the ASF dual-hosted git repository.
skadam 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 5a00e5b PHOENIX-5359: Remove (Global-Indexing)new coprocessors in
CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
5a00e5b is described below
commit 5a00e5b2e33c3344dd2fe6b1940050457a8f10d6
Author: s.kadam
AuthorDate: Thu Jun 20 11:58:55 2019 -0700
PHOENIX-5359: Remove (Global-Indexing)new coprocessors in
CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
---
.../apache/phoenix/query/ConnectionQueryServicesImpl.java | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 3a6..258e676 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -899,12 +899,14 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
TransactionFactory.Provider provider =
getTransactionProvider(tableProps);
boolean isTransactional = (provider != null);
-boolean globalIndexerEnabled = config.getBoolean(
+boolean indexRegionObserverEnabled = config.getBoolean(
QueryServices.INDEX_REGION_OBSERVER_ENABLED_ATTRIB,
QueryServicesOptions.DEFAULT_INDEX_REGION_OBSERVER_ENABLED);
if (tableType == PTableType.INDEX && !isTransactional) {
-if (globalIndexerEnabled &&
!descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
+if (!indexRegionObserverEnabled &&
descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
+
descriptor.removeCoprocessor(GlobalIndexChecker.class.getName());
+} else if (indexRegionObserverEnabled &&
!descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
descriptor.addCoprocessor(GlobalIndexChecker.class.getName(), null, priority -
1, null);
}
}
@@ -945,7 +947,10 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
if
(descriptor.hasCoprocessor(PhoenixTransactionalIndexer.class.getName())) {
descriptor.removeCoprocessor(PhoenixTransactionalIndexer.class.getName());
}
-if (globalIndexerEnabled) {
+if (indexRegionObserverEnabled) {
+if
(descriptor.hasCoprocessor(Indexer.class.getName())) {
+
descriptor.removeCoprocessor(Indexer.class.getName());
+}
if
(!descriptor.hasCoprocessor(IndexRegionObserver.class.getName())) {
Map opts =
Maps.newHashMapWithExpectedSize(1);
opts.put(NonTxIndexBuilder.CODEC_CLASS_NAME_KEY,
PhoenixIndexCodec.class.getName());
@@ -953,6 +958,9 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
}
} else {
+if
(descriptor.hasCoprocessor(IndexRegionObserver.class.getName())) {
+
descriptor.removeCoprocessor(IndexRegionObserver.class.getName());
+}
if
(!descriptor.hasCoprocessor(Indexer.class.getName())) {
Map opts =
Maps.newHashMapWithExpectedSize(1);
opts.put(NonTxIndexBuilder.CODEC_CLASS_NAME_KEY,
PhoenixIndexCodec.class.getName());
[phoenix] branch master updated: PHOENIX-5333: A tool to upgrade existing tables/indexes to use self-consistent global indexes design (#520)
This is an automated email from the ASF dual-hosted git repository.
skadam 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 2af1660 PHOENIX-5333: A tool to upgrade existing tables/indexes to
use self-consistent global indexes design (#520)
2af1660 is described below
commit 2af1660078fb8ea2abe6d2c2e0f79dddab488459
Author: Swaroopa Kadam
AuthorDate: Mon Jul 8 23:50:42 2019 -0700
PHOENIX-5333: A tool to upgrade existing tables/indexes to use
self-consistent global indexes design (#520)
---
.../end2end/ParameterizedIndexUpgradeToolIT.java | 328
.../phoenix/hbase/index/IndexRegionObserver.java | 2 +-
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 548 +
.../apache/phoenix/query/QueryServicesOptions.java | 2 +-
4 files changed, 878 insertions(+), 2 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
new file mode 100644
index 000..d2d68e2
--- /dev/null
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParameterizedIndexUpgradeToolIT.java
@@ -0,0 +1,328 @@
+/*
+ * 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 com.google.common.collect.Maps;
+import org.apache.commons.cli.CommandLine;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Admin;
+import org.apache.phoenix.hbase.index.IndexRegionObserver;
+import org.apache.phoenix.hbase.index.Indexer;
+import org.apache.phoenix.index.GlobalIndexChecker;
+import org.apache.phoenix.jdbc.PhoenixConnection;
+import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.mapreduce.index.IndexUpgradeTool;
+import org.apache.phoenix.query.BaseTest;
+import org.apache.phoenix.query.ConnectionQueryServices;
+import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.util.ReadOnlyProps;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.Parameterized;
+import org.mockito.Mockito;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+
+import static org.apache.phoenix.mapreduce.index.IndexUpgradeTool.ROLLBACK_OP;
+import static org.apache.phoenix.mapreduce.index.IndexUpgradeTool.UPGRADE_OP;
+
+@RunWith(Parameterized.class)
+@Category(NeedsOwnMiniClusterTest.class)
+public class ParameterizedIndexUpgradeToolIT extends BaseTest {
+//Please do not remove/uncomment commented items in the list until
PHOENIX-5385 is fixed
+private static final String [] INDEXES_LIST = {"TEST.INDEX1",
"TEST.INDEX2", "TEST1.INDEX3",
+"TEST1.INDEX2","TEST1.INDEX1","TEST.INDEX3"/*, "_IDX_TEST.MOCK1",
"_IDX_TEST1.MOCK2"*/};
+private static final String [] INDEXES_LIST_NAMESPACE = {"TEST:INDEX1",
"TEST:INDEX2", "TEST1:INDEX3",
+"TEST1:INDEX2","TEST1:INDEX1","TEST:INDEX3"/*, "TEST:_IDX_MOCK1",
"TEST1:_IDX_MOCK2"*/};
+private static final String [] TABLE_LIST =
{"TEST.MOCK1","TEST1.MOCK2","TEST.MOCK3"};
+private static final String [] TABLE_LIST_NAMESPACE =
{"TEST:MOCK1","TEST1:MOCK2","TEST:MOCK3"};
+
+private static final String INPUT_LIST =
"TEST.MOCK1,TEST1.MOCK2,TEST.MOCK3";
+private static final String INPUT_FILE =
"/tmp/input_file_index_upgrade.csv";
+
+private static Map ser
[phoenix] branch 4.14-HBase-1.4 updated: PHOENIX-5359: Remove (Global-Indexing)new coprocessors in CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.4 by this push:
new 6c25645 PHOENIX-5359: Remove (Global-Indexing)new coprocessors in
CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
6c25645 is described below
commit 6c25645a4e8f27f914a23d06bfe4bf23963ff21b
Author: s.kadam
AuthorDate: Wed Jun 26 19:43:14 2019 -0700
PHOENIX-5359: Remove (Global-Indexing)new coprocessors in
CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
---
.../apache/phoenix/query/ConnectionQueryServicesImpl.java | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 72aaa41..4531c45 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -850,12 +850,14 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
boolean isTransactional =
Boolean.TRUE.equals(tableProps.get(TableProperty.TRANSACTIONAL.name())) ||
nonTxToTx;
-boolean globalIndexerEnabled = config.getBoolean(
+boolean indexRegionObserverEnabled = config.getBoolean(
QueryServices.INDEX_REGION_OBSERVER_ENABLED_ATTRIB,
QueryServicesOptions.DEFAULT_INDEX_REGION_OBSERVER_ENABLED);
if (tableType == PTableType.INDEX && !isTransactional) {
-if (globalIndexerEnabled &&
!descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
+if (!indexRegionObserverEnabled &&
descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
+
descriptor.removeCoprocessor(GlobalIndexChecker.class.getName());
+} else if (indexRegionObserverEnabled &&
!descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
descriptor.addCoprocessor(GlobalIndexChecker.class.getName(), null, priority -
1, null);
}
}
@@ -897,7 +899,10 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
if
(descriptor.hasCoprocessor(PhoenixTransactionalIndexer.class.getName())) {
descriptor.removeCoprocessor(PhoenixTransactionalIndexer.class.getName());
}
-if (globalIndexerEnabled) {
+if (indexRegionObserverEnabled) {
+if
(descriptor.hasCoprocessor(Indexer.class.getName())) {
+
descriptor.removeCoprocessor(Indexer.class.getName());
+}
if
(!descriptor.hasCoprocessor(IndexRegionObserver.class.getName())) {
Map opts =
Maps.newHashMapWithExpectedSize(1);
opts.put(NonTxIndexBuilder.CODEC_CLASS_NAME_KEY,
PhoenixIndexCodec.class.getName());
@@ -905,6 +910,9 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
}
} else {
+if
(descriptor.hasCoprocessor(IndexRegionObserver.class.getName())) {
+
descriptor.removeCoprocessor(IndexRegionObserver.class.getName());
+}
if
(!descriptor.hasCoprocessor(Indexer.class.getName())) {
Map opts =
Maps.newHashMapWithExpectedSize(1);
opts.put(NonTxIndexBuilder.CODEC_CLASS_NAME_KEY,
PhoenixIndexCodec.class.getName());
[phoenix] branch 4.14-HBase-1.3 updated: PHOENIX-5359: Remove (Global-Indexing)new coprocessors in CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.3 by this push:
new 1eca377 PHOENIX-5359: Remove (Global-Indexing)new coprocessors in
CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
1eca377 is described below
commit 1eca377f713036e83ec4c9ecf345a70b44eb3b82
Author: s.kadam
AuthorDate: Wed Jun 26 19:43:14 2019 -0700
PHOENIX-5359: Remove (Global-Indexing)new coprocessors in
CQSI#addCoprocessors with flag(INDEX_REGION_OBSERVER_ENABLED_ATTRIB) disabled
---
.../apache/phoenix/query/ConnectionQueryServicesImpl.java | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 72aaa41..4531c45 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -850,12 +850,14 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
boolean isTransactional =
Boolean.TRUE.equals(tableProps.get(TableProperty.TRANSACTIONAL.name())) ||
nonTxToTx;
-boolean globalIndexerEnabled = config.getBoolean(
+boolean indexRegionObserverEnabled = config.getBoolean(
QueryServices.INDEX_REGION_OBSERVER_ENABLED_ATTRIB,
QueryServicesOptions.DEFAULT_INDEX_REGION_OBSERVER_ENABLED);
if (tableType == PTableType.INDEX && !isTransactional) {
-if (globalIndexerEnabled &&
!descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
+if (!indexRegionObserverEnabled &&
descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
+
descriptor.removeCoprocessor(GlobalIndexChecker.class.getName());
+} else if (indexRegionObserverEnabled &&
!descriptor.hasCoprocessor(GlobalIndexChecker.class.getName())) {
descriptor.addCoprocessor(GlobalIndexChecker.class.getName(), null, priority -
1, null);
}
}
@@ -897,7 +899,10 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
if
(descriptor.hasCoprocessor(PhoenixTransactionalIndexer.class.getName())) {
descriptor.removeCoprocessor(PhoenixTransactionalIndexer.class.getName());
}
-if (globalIndexerEnabled) {
+if (indexRegionObserverEnabled) {
+if
(descriptor.hasCoprocessor(Indexer.class.getName())) {
+
descriptor.removeCoprocessor(Indexer.class.getName());
+}
if
(!descriptor.hasCoprocessor(IndexRegionObserver.class.getName())) {
Map opts =
Maps.newHashMapWithExpectedSize(1);
opts.put(NonTxIndexBuilder.CODEC_CLASS_NAME_KEY,
PhoenixIndexCodec.class.getName());
@@ -905,6 +910,9 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
}
} else {
+if
(descriptor.hasCoprocessor(IndexRegionObserver.class.getName())) {
+
descriptor.removeCoprocessor(IndexRegionObserver.class.getName());
+}
if
(!descriptor.hasCoprocessor(Indexer.class.getName())) {
Map opts =
Maps.newHashMapWithExpectedSize(1);
opts.put(NonTxIndexBuilder.CODEC_CLASS_NAME_KEY,
PhoenixIndexCodec.class.getName());
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view indexes
This is an automated email from the ASF dual-hosted git repository.
skadam 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 e261fbe PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view
indexes
e261fbe is described below
commit e261fbe776e4917484674929cda1d660187353dd
Author: s.kadam
AuthorDate: Tue Jul 16 12:34:01 2019 -0700
PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view indexes
---
.../end2end/ParameterizedIndexUpgradeToolIT.java | 31 +++--
.../apache/phoenix/end2end/index/DropColumnIT.java | 8 ++--
.../org/apache/phoenix/execute/MutationState.java | 53 ++
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 38 ++--
.../phoenix/query/ConnectionQueryServicesImpl.java | 13 ++
5 files changed, 84 insertions(+), 59 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 400df93..24c0f39 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
@@ -60,11 +60,11 @@ import static
org.apache.phoenix.mapreduce.index.IndexUpgradeTool.UPGRADE_OP;
@RunWith(Parameterized.class)
@Category(NeedsOwnMiniClusterTest.class)
public class ParameterizedIndexUpgradeToolIT extends BaseTest {
-//Please do not remove/uncomment commented items in the list until
PHOENIX-5385 is fixed
private static final String [] INDEXES_LIST = {"TEST.INDEX1",
"TEST.INDEX2", "TEST1.INDEX3",
-"TEST1.INDEX2","TEST1.INDEX1","TEST.INDEX3"/*, "_IDX_TEST.MOCK1",
"_IDX_TEST1.MOCK2"*/};
-private static final String [] INDEXES_LIST_NAMESPACE = {"TEST:INDEX1",
"TEST:INDEX2", "TEST1:INDEX3",
-"TEST1:INDEX2","TEST1:INDEX1","TEST:INDEX3"/*, "TEST:_IDX_MOCK1",
"TEST1:_IDX_MOCK2"*/};
+"TEST1.INDEX2","TEST1.INDEX1","TEST.INDEX3", "_IDX_TEST.MOCK1",
"_IDX_TEST1.MOCK2"};
+private static final String [] INDEXES_LIST_NAMESPACE = {"TEST:INDEX1",
"TEST:INDEX2",
+"TEST1:INDEX3", "TEST1:INDEX2","TEST1:INDEX1","TEST:INDEX3",
"TEST:_IDX_MOCK1",
+"TEST1:_IDX_MOCK2"};
private static final String [] TABLE_LIST =
{"TEST.MOCK1","TEST1.MOCK2","TEST.MOCK3"};
private static final String [] TABLE_LIST_NAMESPACE =
{"TEST:MOCK1","TEST1:MOCK2","TEST:MOCK3"};
@@ -99,7 +99,8 @@ public class ParameterizedIndexUpgradeToolIT extends BaseTest
{
.getQueryServices();
admin = queryServices.getAdmin();
iut = new IndexUpgradeTool(upgrade ? UPGRADE_OP : ROLLBACK_OP,
INPUT_LIST,
-null, "/tmp/index_upgrade_" +
UUID.randomUUID().toString(),true, Mockito.mock(IndexTool.class));
+null, "/tmp/index_upgrade_" + UUID.randomUUID().toString(),
+true, Mockito.mock(IndexTool.class));
iut.setConf(getUtility().getConfiguration());
iut.setTest(true);
if (!mutable) {
@@ -141,9 +142,8 @@ public class ParameterizedIndexUpgradeToolIT extends
BaseTest {
conn.createStatement().execute("CREATE TABLE TEST.MOCK3 (id bigint NOT
NULL "
+ "PRIMARY KEY, name varchar, age bigint)"+tableDDLOptions);
-//Please do not remove/uncomment commented code until PHOENIX-5385 is
fixed
//views
-/*conn.createStatement().execute("CREATE VIEW TEST.MOCK1_VIEW
(view_column varchar) "
+conn.createStatement().execute("CREATE VIEW TEST.MOCK1_VIEW
(view_column varchar) "
+ "AS SELECT * FROM TEST.MOCK1 WHERE a.name = 'a'");
conn.createStatement().execute("CREATE VIEW TEST.MOCK1_VIEW1
(view_column varchar,"
+ " zip varchar) AS SELECT * FROM TEST.MOCK1 WHERE a.name =
'a'");
@@ -157,7 +157,7 @@ public class ParameterizedIndexUpgradeToolIT extends
BaseTest {
conn.createStatement().execute("CREATE INDEX MOCK2_INDEX1 ON
TEST1.MOCK2_VIEW "
+ "(state, city)");
conn.createStatement().execute("CREATE INDEX MOCK1_INDEX3 ON
TEST.MOCK1_VIEW "
-+ "(view_column)");*/
++ "(view_column)");
//indexes
conn.createStatement().execute("CREAT
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view indexes
This is an automated email from the ASF dual-hosted git repository.
skadam 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 ac2faec PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view
indexes
ac2faec is described below
commit ac2faec980f84f2cc395c1fffd6b2678e56900c8
Author: s.kadam
AuthorDate: Tue Jul 16 12:34:01 2019 -0700
PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view indexes
---
.../end2end/ParameterizedIndexUpgradeToolIT.java | 31 +++--
.../apache/phoenix/end2end/index/DropColumnIT.java | 8 ++--
.../org/apache/phoenix/execute/MutationState.java | 53 ++
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 38 ++--
.../phoenix/query/ConnectionQueryServicesImpl.java | 13 ++
5 files changed, 84 insertions(+), 59 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 400df93..24c0f39 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
@@ -60,11 +60,11 @@ import static
org.apache.phoenix.mapreduce.index.IndexUpgradeTool.UPGRADE_OP;
@RunWith(Parameterized.class)
@Category(NeedsOwnMiniClusterTest.class)
public class ParameterizedIndexUpgradeToolIT extends BaseTest {
-//Please do not remove/uncomment commented items in the list until
PHOENIX-5385 is fixed
private static final String [] INDEXES_LIST = {"TEST.INDEX1",
"TEST.INDEX2", "TEST1.INDEX3",
-"TEST1.INDEX2","TEST1.INDEX1","TEST.INDEX3"/*, "_IDX_TEST.MOCK1",
"_IDX_TEST1.MOCK2"*/};
-private static final String [] INDEXES_LIST_NAMESPACE = {"TEST:INDEX1",
"TEST:INDEX2", "TEST1:INDEX3",
-"TEST1:INDEX2","TEST1:INDEX1","TEST:INDEX3"/*, "TEST:_IDX_MOCK1",
"TEST1:_IDX_MOCK2"*/};
+"TEST1.INDEX2","TEST1.INDEX1","TEST.INDEX3", "_IDX_TEST.MOCK1",
"_IDX_TEST1.MOCK2"};
+private static final String [] INDEXES_LIST_NAMESPACE = {"TEST:INDEX1",
"TEST:INDEX2",
+"TEST1:INDEX3", "TEST1:INDEX2","TEST1:INDEX1","TEST:INDEX3",
"TEST:_IDX_MOCK1",
+"TEST1:_IDX_MOCK2"};
private static final String [] TABLE_LIST =
{"TEST.MOCK1","TEST1.MOCK2","TEST.MOCK3"};
private static final String [] TABLE_LIST_NAMESPACE =
{"TEST:MOCK1","TEST1:MOCK2","TEST:MOCK3"};
@@ -99,7 +99,8 @@ public class ParameterizedIndexUpgradeToolIT extends BaseTest
{
.getQueryServices();
admin = queryServices.getAdmin();
iut = new IndexUpgradeTool(upgrade ? UPGRADE_OP : ROLLBACK_OP,
INPUT_LIST,
-null, "/tmp/index_upgrade_" +
UUID.randomUUID().toString(),true, Mockito.mock(IndexTool.class));
+null, "/tmp/index_upgrade_" + UUID.randomUUID().toString(),
+true, Mockito.mock(IndexTool.class));
iut.setConf(getUtility().getConfiguration());
iut.setTest(true);
if (!mutable) {
@@ -141,9 +142,8 @@ public class ParameterizedIndexUpgradeToolIT extends
BaseTest {
conn.createStatement().execute("CREATE TABLE TEST.MOCK3 (id bigint NOT
NULL "
+ "PRIMARY KEY, name varchar, age bigint)"+tableDDLOptions);
-//Please do not remove/uncomment commented code until PHOENIX-5385 is
fixed
//views
-/*conn.createStatement().execute("CREATE VIEW TEST.MOCK1_VIEW
(view_column varchar) "
+conn.createStatement().execute("CREATE VIEW TEST.MOCK1_VIEW
(view_column varchar) "
+ "AS SELECT * FROM TEST.MOCK1 WHERE a.name = 'a'");
conn.createStatement().execute("CREATE VIEW TEST.MOCK1_VIEW1
(view_column varchar,"
+ " zip varchar) AS SELECT * FROM TEST.MOCK1 WHERE a.name =
'a'");
@@ -157,7 +157,7 @@ public class ParameterizedIndexUpgradeToolIT extends
BaseTest {
conn.createStatement().execute("CREATE INDEX MOCK2_INDEX1 ON
TEST1.MOCK2_VIEW "
+ "(state, city)");
conn.createStatement().execute("CREATE INDEX MOCK1_INDEX3 ON
TEST.MOCK1_VIEW "
-+ "(view_column)");*/
++ "(view_column)");
//indexes
conn.createStatement().execute("CREAT
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view indexes
This is an automated email from the ASF dual-hosted git repository.
skadam 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 ca13453 PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view
indexes
ca13453 is described below
commit ca134532b49a5a7ba77e08b3fcd84486216cd8ee
Author: s.kadam
AuthorDate: Tue Jul 16 12:34:01 2019 -0700
PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view indexes
---
.../end2end/ParameterizedIndexUpgradeToolIT.java | 31 +++--
.../apache/phoenix/end2end/index/DropColumnIT.java | 8 ++--
.../org/apache/phoenix/execute/MutationState.java | 53 ++
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 38 ++--
.../phoenix/query/ConnectionQueryServicesImpl.java | 13 ++
5 files changed, 84 insertions(+), 59 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 400df93..24c0f39 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
@@ -60,11 +60,11 @@ import static
org.apache.phoenix.mapreduce.index.IndexUpgradeTool.UPGRADE_OP;
@RunWith(Parameterized.class)
@Category(NeedsOwnMiniClusterTest.class)
public class ParameterizedIndexUpgradeToolIT extends BaseTest {
-//Please do not remove/uncomment commented items in the list until
PHOENIX-5385 is fixed
private static final String [] INDEXES_LIST = {"TEST.INDEX1",
"TEST.INDEX2", "TEST1.INDEX3",
-"TEST1.INDEX2","TEST1.INDEX1","TEST.INDEX3"/*, "_IDX_TEST.MOCK1",
"_IDX_TEST1.MOCK2"*/};
-private static final String [] INDEXES_LIST_NAMESPACE = {"TEST:INDEX1",
"TEST:INDEX2", "TEST1:INDEX3",
-"TEST1:INDEX2","TEST1:INDEX1","TEST:INDEX3"/*, "TEST:_IDX_MOCK1",
"TEST1:_IDX_MOCK2"*/};
+"TEST1.INDEX2","TEST1.INDEX1","TEST.INDEX3", "_IDX_TEST.MOCK1",
"_IDX_TEST1.MOCK2"};
+private static final String [] INDEXES_LIST_NAMESPACE = {"TEST:INDEX1",
"TEST:INDEX2",
+"TEST1:INDEX3", "TEST1:INDEX2","TEST1:INDEX1","TEST:INDEX3",
"TEST:_IDX_MOCK1",
+"TEST1:_IDX_MOCK2"};
private static final String [] TABLE_LIST =
{"TEST.MOCK1","TEST1.MOCK2","TEST.MOCK3"};
private static final String [] TABLE_LIST_NAMESPACE =
{"TEST:MOCK1","TEST1:MOCK2","TEST:MOCK3"};
@@ -99,7 +99,8 @@ public class ParameterizedIndexUpgradeToolIT extends BaseTest
{
.getQueryServices();
admin = queryServices.getAdmin();
iut = new IndexUpgradeTool(upgrade ? UPGRADE_OP : ROLLBACK_OP,
INPUT_LIST,
-null, "/tmp/index_upgrade_" +
UUID.randomUUID().toString(),true, Mockito.mock(IndexTool.class));
+null, "/tmp/index_upgrade_" + UUID.randomUUID().toString(),
+true, Mockito.mock(IndexTool.class));
iut.setConf(getUtility().getConfiguration());
iut.setTest(true);
if (!mutable) {
@@ -141,9 +142,8 @@ public class ParameterizedIndexUpgradeToolIT extends
BaseTest {
conn.createStatement().execute("CREATE TABLE TEST.MOCK3 (id bigint NOT
NULL "
+ "PRIMARY KEY, name varchar, age bigint)"+tableDDLOptions);
-//Please do not remove/uncomment commented code until PHOENIX-5385 is
fixed
//views
-/*conn.createStatement().execute("CREATE VIEW TEST.MOCK1_VIEW
(view_column varchar) "
+conn.createStatement().execute("CREATE VIEW TEST.MOCK1_VIEW
(view_column varchar) "
+ "AS SELECT * FROM TEST.MOCK1 WHERE a.name = 'a'");
conn.createStatement().execute("CREATE VIEW TEST.MOCK1_VIEW1
(view_column varchar,"
+ " zip varchar) AS SELECT * FROM TEST.MOCK1 WHERE a.name =
'a'");
@@ -157,7 +157,7 @@ public class ParameterizedIndexUpgradeToolIT extends
BaseTest {
conn.createStatement().execute("CREATE INDEX MOCK2_INDEX1 ON
TEST1.MOCK2_VIEW "
+ "(state, city)");
conn.createStatement().execute("CREATE INDEX MOCK1_INDEX3 ON
TEST.MOCK1_VIEW "
-+ "(view_column)");*/
++ "(view_column)");
//indexes
conn.createStatement().execute("CREAT
[phoenix] branch master updated: PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view indexes
This is an automated email from the ASF dual-hosted git repository.
skadam 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 fab96c3 PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view
indexes
fab96c3 is described below
commit fab96c3a9d031045e876cbea11033507e5c425ca
Author: s.kadam
AuthorDate: Tue Jul 16 12:14:41 2019 -0700
PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view indexes
---
.../end2end/ParameterizedIndexUpgradeToolIT.java | 31 +--
.../apache/phoenix/end2end/index/DropColumnIT.java | 9 ++--
.../org/apache/phoenix/execute/MutationState.java | 60 ++
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 23 +
.../phoenix/query/ConnectionQueryServicesImpl.java | 13 +++--
5 files changed, 81 insertions(+), 55 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 d2d68e2..2cde910 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
@@ -25,6 +25,7 @@ import org.apache.phoenix.hbase.index.IndexRegionObserver;
import org.apache.phoenix.hbase.index.Indexer;
import org.apache.phoenix.index.GlobalIndexChecker;
import org.apache.phoenix.jdbc.PhoenixConnection;
+
import org.apache.phoenix.mapreduce.index.IndexTool;
import org.apache.phoenix.mapreduce.index.IndexUpgradeTool;
import org.apache.phoenix.query.BaseTest;
@@ -60,11 +61,11 @@ import static
org.apache.phoenix.mapreduce.index.IndexUpgradeTool.UPGRADE_OP;
@RunWith(Parameterized.class)
@Category(NeedsOwnMiniClusterTest.class)
public class ParameterizedIndexUpgradeToolIT extends BaseTest {
-//Please do not remove/uncomment commented items in the list until
PHOENIX-5385 is fixed
private static final String [] INDEXES_LIST = {"TEST.INDEX1",
"TEST.INDEX2", "TEST1.INDEX3",
-"TEST1.INDEX2","TEST1.INDEX1","TEST.INDEX3"/*, "_IDX_TEST.MOCK1",
"_IDX_TEST1.MOCK2"*/};
-private static final String [] INDEXES_LIST_NAMESPACE = {"TEST:INDEX1",
"TEST:INDEX2", "TEST1:INDEX3",
-"TEST1:INDEX2","TEST1:INDEX1","TEST:INDEX3"/*, "TEST:_IDX_MOCK1",
"TEST1:_IDX_MOCK2"*/};
+"TEST1.INDEX2","TEST1.INDEX1","TEST.INDEX3", "_IDX_TEST.MOCK1",
"_IDX_TEST1.MOCK2"};
+private static final String [] INDEXES_LIST_NAMESPACE = {"TEST:INDEX1",
"TEST:INDEX2"
+, "TEST1:INDEX3", "TEST1:INDEX2","TEST1:INDEX1"
+, "TEST:INDEX3", "TEST:_IDX_MOCK1", "TEST1:_IDX_MOCK2"};
private static final String [] TABLE_LIST =
{"TEST.MOCK1","TEST1.MOCK2","TEST.MOCK3"};
private static final String [] TABLE_LIST_NAMESPACE =
{"TEST:MOCK1","TEST1:MOCK2","TEST:MOCK3"};
@@ -99,8 +100,8 @@ public class ParameterizedIndexUpgradeToolIT extends
BaseTest {
.getQueryServices();
admin = queryServices.getAdmin();
iut = new IndexUpgradeTool(upgrade ? UPGRADE_OP : ROLLBACK_OP,
INPUT_LIST,
-null, "/tmp/index_upgrade_" +
UUID.randomUUID().toString(),true,
-Mockito.mock(IndexTool.class));
+null, "/tmp/index_upgrade_" +
UUID.randomUUID().toString(),true, Mockito.mock(
+IndexTool.class));
iut.setConf(getUtility().getConfiguration());
iut.setTest(true);
if (!mutable) {
@@ -141,8 +142,7 @@ public class ParameterizedIndexUpgradeToolIT extends
BaseTest {
+ "PRIMARY KEY, name varchar, city varchar, phone
bigint)"+tableDDLOptions);
conn.createStatement().execute("CREATE TABLE TEST.MOCK3 (id bigint NOT
NULL "
+ "PRIMARY KEY, name varchar, age bigint)"+tableDDLOptions);
-/*
-Please do not remove/uncomment commented code until PHOENIX-5385 is
fixed
+
//views
conn.createStatement().execute("CREATE VIEW TEST.MOCK1_VIEW
(view_column varchar) "
+ "AS SELECT * FROM TEST.MOCK1 WHERE a.name = 'a'");
@@ -158,7 +158,7 @@ public class ParameterizedIndexUpgradeToolIT extends
BaseTest {
conn.createStatement().execute("CREATE INDEX MOCK2_INDEX1 ON
TEST1.MOCK2_VIEW "
+ "(state, city)");
conn.createStatement().execute("CREATE INDEX MOCK1_INDEX3 ON
TEST.MO
svn commit: r35236 - in /dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2: ./ bin/ src/
Author: skadam Date: Wed Aug 14 00:47:41 2019 New Revision: 35236 Log: Adding 4.14.3-HBase-1.3-rc2 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz (with props) dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.asc dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha256 dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha512 dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/src/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz (with props) dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.asc dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.sha256 dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.sha512 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.asc == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.asc (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.asc Wed Aug 14 00:47:41 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEU7Kwsh8ErH62QWeCSLeAfZXxJ7UFAl1TWAEACgkQSLeAfZXx +J7XREg//WLPcnIVgXvlTBAT+IVomFq8pgV+gDxUNkwD11HpOIYbjHuWb7S9ZiMDB +sVJGnN6kvmy84UlhbPpKCBPFKGBwnLhM62da1BKW9a9IWGKgF/gPsZ0WT9m+/yg+ +65TdwE5GrjrTgehXQ8w2vonqFGbk8/N21fHLLGiYp/aTk9bmC7R0qR+rntYSjCDr +c6/d2g0ozHbjL3/KFmzP413B1xNRwqAhn4SXW99F5YllqXlgVISjKQthcgeHonco +HV8EC8v1YIVqW5XCoq1bFGUEheeksILgt3QCGYoTc3YNbmjz5Qk9FdhNPhR9rL6L +tr97C3PuxY5I3ncvRWU8PgSds4kT5jk5XLE7iafr+OdID+7mBc3XN73UkcAVoZK0 +k6J+2KI2hvqh1RprazkgF43fLuOIk07g5LQKQkeG+JmXe++PtJbWdIoWaHIKy1cx +tGYLGgqH3Aahxva9u0/Crj6b1YGLcKxY3zqWBWW8w99HjamnwNLTEJutbt6OvIcj +3mim3ZqdFxXYNBqeFHWYu5BSr5fSwzszMOIs8fnoEW1EJnhOYbGWlDvJACImAIqd +MTDomCCXYpuBdI0IZ9SEnCnGd0YaszhABVCYF18p45p9wnlmHt6ACn6kRUL2NBzA +LqafoKWBMa5cvIpdZMFk0x/Jei/G0slWq5LjxiPF+zX61g1Dju4= +=WIDw +-END PGP SIGNATURE- Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha256 == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha256 (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha256 Wed Aug 14 00:47:41 2019 @@ -0,0 +1 @@ +SHA256(apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz)= 5b70050df110c0a034a2e5fe5bb6dd00e765f150a8eaf6fe2f9ad4eb75b6ce63 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha512 == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha512 (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha512 Wed Aug 14 00:47:41 2019 @@ -0,0 +1 @@ +SHA512(apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz)= d2a2ba964c7035eff2509fe71c70e3b393823dbff37421ebab0b12ad00b6d2d3475b5ec942fce59d84bb24959f6c192023b6604465dd813793ead4c0ff9a55a7 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.asc == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.asc (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc2/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.asc Wed Aug 14 00:47:41 2019 @@ -0,0 +1,16
svn commit: r35235 - in /dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2: ./ bin/ src/
Author: skadam Date: Wed Aug 14 00:10:51 2019 New Revision: 35235 Log: Adding 4.14.3-HBase-1.4-rc2 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz (with props) dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.asc dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha256 dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha512 dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/src/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz (with props) dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.asc dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.sha256 dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.sha512 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.asc == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.asc (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.asc Wed Aug 14 00:10:51 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEU7Kwsh8ErH62QWeCSLeAfZXxJ7UFAl1TUB4ACgkQSLeAfZXx +J7VsChAApwq/KdML+w0cYUH1/NtidbABGkG9WUQnsBjoUvwKzH7tdvpAdCKzMHY8 +Hm+6IOMiww7EF/0nzR0Mr4e0wCWAt2JraMC215n+VIha8Z5aquLOAKwfAx1VPJHc +4UfB74zIBXzQHZmR1ZNGg7FUsM7KDFY8E3R+JMH0Ynat+xbFTtPNhKro9riH1L75 +eYR4o5Y86xYDwXWPpr8dDRglYr77hy7/LqEWCrHB/wh4QwkJpwgp8fF0lfwaw7kn +lsygD9XuNAdZncYm8nMM+ghQZzaQxTsqihhf4D8LK3ZSNzroj3S6PwwcvQGz4+1e +Hf1cQqa3C0D8hgn0IZI6svYnNi935ixjmj1nLwXc5QQQbASgqTUMIm3ef/E8QZBm +1zvDxRfJuwlr/G+bqYPFw1828pct1kz2iGMvgjFefdzpvUDaWyl9J8yK0akLdgpp +iIrfK5nH+BPoH/O3dYMI4zW/d3O3LlXoDmPsmaukLxPxU3KqEEdTLIzB52ssUow4 +q3Jl77HwAyelaEQA8uHY1/HmfK+GUI2tUcaVcYXxsgiAcMAc/QDTr//FvrpmfR3g +ERcphUwEAeoXhpMKA3rV1ejWDAPaySEycw7DtsXjgqF61MraPcC+OMrWgxio4Due +F2TCER9bpIYOyNEUjQCQteN5t6Z7o9n0jqz6LaPlgNipuiGmk9M= +=1yWf +-END PGP SIGNATURE- Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha256 == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha256 (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha256 Wed Aug 14 00:10:51 2019 @@ -0,0 +1 @@ +SHA256(apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz)= 3eab527ff545d6c48842bac6d667dc49e4652e100a0030c420b55584eb609515 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha512 == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha512 (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha512 Wed Aug 14 00:10:51 2019 @@ -0,0 +1 @@ +SHA512(apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz)= bf6c40db7be1c2b160d911ff04cafcfc6b1b14cb7d4751d453fd2877ba0d93c8712ee54eb987e36dee6cdbff2476cc15594d93f45d27b60f7c43be518b07ef24 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.asc == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.asc (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc2/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.asc Wed Aug 14 00:10:51 2019 @@ -0,0 +1,16
[phoenix] annotated tag v4.14.3-HBase-1.4-rc2 updated (eb54245 -> d7d5eb5)
This is an automated email from the ASF dual-hosted git repository. skadam pushed a change to annotated tag v4.14.3-HBase-1.4-rc2 in repository https://gitbox.apache.org/repos/asf/phoenix.git. *** WARNING: tag v4.14.3-HBase-1.4-rc2 was modified! *** from eb54245 (commit) to d7d5eb5 (tag) tagging eb5424573bd2f5f247a61d1a28da81fb92f06ec6 (commit) replaces v4.14.2-HBase-1.4 by s.kadam on Tue Aug 13 17:06:01 2019 -0700 - Log - v4.14.3-HBase-1.4-rc2 --- No new revisions were added by this update. Summary of changes:
[phoenix] branch 4.14-HBase-1.4 updated: PHOENIX-5441: NPE in phoenix-pherf/ConfigurationParserTest#testConfigReader (Mihir Monani)
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.4 by this push:
new e5c4813 PHOENIX-5441: NPE in
phoenix-pherf/ConfigurationParserTest#testConfigReader (Mihir Monani)
e5c4813 is described below
commit e5c48137e2b91058d196e7b6a017b76b740f3713
Author: s.kadam
AuthorDate: Tue Aug 13 11:13:59 2019 -0700
PHOENIX-5441: NPE in phoenix-pherf/ConfigurationParserTest#testConfigReader
(Mihir Monani)
Signed-off-by: s.kadam
---
.../src/test/java/org/apache/phoenix/pherf/ConfigurationParserTest.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ConfigurationParserTest.java
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ConfigurationParserTest.java
index a2b5b63..a791a5c 100644
---
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ConfigurationParserTest.java
+++
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ConfigurationParserTest.java
@@ -199,6 +199,7 @@ public class ConfigurationParserTest extends ResultBaseTest
{
data.setDataMappingColumns(columnList);
Scenario scenario = new Scenario();
+scenario.setName("Index_Scenario");
scenario.setTenantId("00DXX");
List preScenarioDdls = new ArrayList();
preScenarioDdls.add(new Ddl("CREATE INDEX IF NOT EXISTS ? ON
FHA (NEWVAL_NUMBER) ASYNC", "FHAIDX_NEWVAL_NUMBER"));
@@ -219,6 +220,7 @@ public class ConfigurationParserTest extends ResultBaseTest
{
querySet.setNumberOfExecutions(20);
query.setStatement("select * from FHA");
Scenario scenario2 = new Scenario();
+scenario2.setName("RowCount_Scenario");
scenario2.setPhoenixProperties(new HashMap());
scenario2.setDataOverride(new DataOverride());
scenario2.setTableName("tableName2");
[phoenix] annotated tag v4.14.3-HBase-1.3-rc2 updated (e299355 -> 77bba61)
This is an automated email from the ASF dual-hosted git repository. skadam pushed a change to annotated tag v4.14.3-HBase-1.3-rc2 in repository https://gitbox.apache.org/repos/asf/phoenix.git. *** WARNING: tag v4.14.3-HBase-1.3-rc2 was modified! *** from e299355 (commit) to 77bba61 (tag) tagging e2993552dc88cb7fc59fc0dfdaa2876ac260886c (commit) replaces v4.14.2-HBase-1.3 by s.kadam on Tue Aug 13 17:41:47 2019 -0700 - Log - v4.14.3-HBase-1.3-rc2 --- No new revisions were added by this update. Summary of changes:
svn commit: r35062 - /dev/phoenix/KEYS
Author: skadam Date: Mon Jul 29 23:26:02 2019 New Revision: 35062 Log: Adding Swaroopa public key Added: dev/phoenix/KEYS Added: dev/phoenix/KEYS == --- dev/phoenix/KEYS (added) +++ dev/phoenix/KEYS Mon Jul 29 23:26:02 2019 @@ -0,0 +1,840 @@ +This file contains the PGP keys of various developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Examples of importing this file in your keystore: + gpg --import KEYS.txt + +Examples of adding your key to this file: + pgp -kxa and append it to this file. + (pgpk -ll && pgpk -xa ) >> this file. + (gpg --list-sigs + && gpg --armor --export ) >> this file. + + + +pub 4096R/17AF6E3F 2014-02-07 +uid Mujtaba Chohan (CODE SIGNING KEY) +sig 317AF6E3F 2014-02-07 Mujtaba Chohan (CODE SIGNING KEY) +sub 4096R/7E67B00D 2014-02-07 +sig 17AF6E3F 2014-02-07 Mujtaba Chohan (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.10 (GNU/Linux) + +mQINBFL1UAsBEACcbU3ztdV/TAzUUND9X3JMsDRd2uGs8YLawwM2k1IrYMb2kXXh +2x9U+WiSf2zGWNIgQ+tB5wp1d2SdCblqOTfYUPeuEeGK1y77KZgbar1UsF+zU2ny +wwpXH1wUIXoGswcI1WN6EkKiciQUNdKUJi9D3tkuNEc5usutdPC4rjJb3CLq2DTw +PKID8cuTyM645K7+uKElDrGOz24PpFIYDiFyCL6GZOOLyY4nkU2kcybCB42FHD64 +w+fMEcLXp5rmNIKv/W6r4j6kL54HZO8xsLkBtbaj/dz4RXmNrVjvsTuwTd35Jcnl +CLIKxMIC/bj3TkIHE9HFAbR7QuIPnXDR3jYL0pJbi0KOqd7klZ+qoh2QtMZrVuvQ +LR4ALf8oJNjd9zuXWnB+e3K6g7t1ainPF3ELiOykMzrBZ9SmZSv5pW6nosZht6Tq +D8spRM5C+Mk0ZPkCuVWOSJXmxaoU6lRenENfQuA8GruQZGTxWE5rTngd3+1wrZZu +jQRTohtFIIWa9cAvyF7Dj/yXnSBUK/7N2z9eWglHIu64qkbQuDBIMDjb96a9FV9h +CsR+aZqxM/dE/LUavTWyTV0NKWWG/1cPqb1/SnkKt/xMw6y4+lDp8d1C8BLWehUD +FPXOIHubJq+UoR+zZlI7HrdCH87vKsvsP8Ayr2A7vHF/oXjg4vFS0YqvSQARAQAB +tDZNdWp0YWJhIENob2hhbiAoQ09ERSBTSUdOSU5HIEtFWSkgPG11anRhYmFAYXBh +Y2hlLm9yZz6JAjcEEwEKACEFAlL1UAsCGwMFCwkIBwMFFQoJCAsFFgIDAQACHgEC +F4AACgkQLX6wuBevbj+SIw/+I9ryZVKuC5qjEOGRkCunWH7kLOMFVb2OMiQEKF7F +SC7a4cmo9AzRZZmI/FKp3zRS0HK79HuM2CLzvMZUVAOKqZK2YDzEfwyO0pYaA+n3 +LMgdquVOvELPb6M1WSom1pbx3iX51tWpxFjodo61GCYr0xTJnoVqgiDpVCOQNLE4 +PrF1nvWaNTZ8/xEDSdPFbgP5gMLDsvhfM2P9QNOklFzlhjgMiMdz2qRUjMTNB+zo +JA51vvr5bAs25w1y62HIbNTFuHzVrRACyDL/DfmmOB3u6cXC2cZIpWGPWwzRrmV7 +IMDvu0xKnrk6ug+63iwUlDeY6Gbc5QZjmbuGYsYTC4QhINv3iLhyFCkYRkLq82bw +1x1ahLYtaZPlS8ulcM3g1QSBsw4u4Iv20/uxwJOdlqgMwvuK+U7EnQ1CjwofGPd4 +To47x4C5s4Pu1/MJVWuJ8ZYjQu5+nltz0LVxilZM8xg9L03++0OBOqI7lWPjkg3+ +qWAaj9lTQDHio1D88TGxih+i9cVV0fweGWm7iRPhvW4Iu2mYhairIkHIO1RVoGVM +2uKYxr/jHR3zmK4ytn7Bfp3KEGru5gFVfDg1q0Dy3Xhud5AWQGti0Zvqel8KoGDO +iGTJFLby1XWb2kxUEJdQsakrhoeCnVCjf4J+FUc+6zzyCBnmLqSO+lCB+GhT46XF +hmO5Ag0EUvVQCwEQANNN8quSUuZH68Gakjt/Pmc1WZjy0sb87mkGyfmAVCvE1Nyn +RzGfkeGn2J29+wPmn3bvPhfHa25xAgBBLXfUOh5JKbsMmfpgWr71+An4h5Eehjat +czR5EZ2r50hqdDDvcO4jB/oXU8cWxVNZztHkqtSlltwdgwNbYp4wNNjLFqYbNP6I +QmH6ZQYV07aN9GbCqd8WsypFq9SCRNYapiKWXNSe9zLE9no8rNG38uOmGN7zQvMA +3lmrYZRTY/VsIeel6wyCplWDydsqJJfqe7SHXCwaGTejyScPe7brLWQRAcBJCuL/ +0ujCQCP5MEZXvINsCCHr4o1K9e4gVz45aMKf6TWQjYkV9Jz1Lp4NaM14cJzANhco +MsqDQkz0VFHadKZltrCVEki8bA5VtYlMCDVRZMz9kfsVMcWLgXjoQJ1SMOCg9Go3 +EoQVhBvUUARl4SOqGOz6359tSrvy2jAmtomD9SeRZu0bWfMiW0nHp8/bLFYU/+tY +4u23eFdNedCSp86FGQ072F3rdcE9OtMqca2wD4DT+hA8O9VETNCHCzAhIJEDKDud +hc8pWwGA7jbxiV4rDPrZ7+7z9bxTpVrJfQDmruARrilxOStoMKrwV2a61NemNYjZ +eaz+76ey/msTnUGPIxsHWByDm5m9nVXteCkM5DcejBms1mCisxplktjPcPElABEB +AAGJAh8EGAEKAAkFAlL1UAsCGwwACgkQLX6wuBevbj9Lvw//QIKt4/uc0u35kaPG +6DfAaQCq3G5HdyURU2OGpwID8VjSE0fClTsDUfzPheBClvvRN+tOteCrd3DXUv++ +iFprrP+Aq40zqPUx2sEc9l8D4gckXGEAp6mchpA8Rp5g4LRG7Bpon41icKBoZNpt +/qEWLiAGJ2YTi9tApJHtobcSzjqs+tuF9CC8YMUpL5j7NjE+wTEkhXnR9kAvCok0 +R6bqCKggubu9qHLCSH+vgbEfAE+Nsd3Z6UjPoyVcES6eW9TxFneBtXU2qxDZKwRJ +dPllgjJZj6b8NtVsMZq7PMQHYQ+dMB+t/wPvu4W0V8JbgR5GKoUMsuu1A7nUfMpX +QdlfAhK2EKpW8zRhlGrvcgw3zTEzJlUBpxCWv2T1w9dU2Ityhbkbx+KdbVZwH261 +d7XcJnw2IkCFG+vct4h2rfVwGXqoZyYb+d2hMsPtyQjOKnZ3srzohxepH7n7e/na +4xw9rjGvGRMWsgrbhTXjWbw1HCQG6Tzs+xGT9PbkHuGa2bba0Kq83nFqfESQ0NCA +fMFOWYmlNK8cL+Z7zaEOFYF5ug/i0hZhhzKZc03ryhEaIEVB9Un62rLnbmgIQxF6 +8tc9Ra+TfPKIXgIY0QdjgBN5Yy6B2aBWHx2E3AkTLGyWgv/8BERDC+xCWCdORdIs +GR2wPntvTGNAWEcuwD1/D1gws5A= +=nO9e +-END PGP PUBLIC KEY BLOCK- +pub 4096R/9461178E 2014-08-20 +uid Mujtaba Chohan (CODE SIGNING KEY) +sig 39461178E 2014-08-20 Mujtaba Chohan (CODE SIGNING KEY) +sub 4096R/040CE8A4 2014-08-20 +sig 9461178E 2014-08-20 Mujtaba Chohan (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.11 (GNU/Linux) + +mQINBFP1AnkBEADK1yeCj4No8mPDt5jjua8/7ccHznUlcWfDn/Nae2iMsV/ric5z +KrcK4biEdYSvnwDnzfEQB7mox0nY529JpWNZcCMvvQ+A8GooOoVPcojYTm5L3nvG ++u5CR49h1h9cOtih+1ddx/gYxJrDgjkQ37lvuEEz3W8s2sque37eekN4iC2Ujqok +Zhz4s924oTrIl6TR7hLVK5tG4QoUZbbx3ALzWwG8NkTmJmwOjgyhHqO/mfM4Bjga +RFMe/by1XVa6Fd37Nvl24/EYfb+WmIwlcNa+jgNDcZmLUJQpHbnWHVkaWI4cDHXV +qu18J6RjbXWqWjE+CW
[phoenix] branch master updated: PHOENIX-5390:Changing anonymous inner classes
This is an automated email from the ASF dual-hosted git repository.
skadam 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 4e65c90 PHOENIX-5390:Changing anonymous inner classes
4e65c90 is described below
commit 4e65c902539be485ef911cd3f4e6dd726672c9c5
Author: Neha
AuthorDate: Fri Jul 26 11:43:01 2019 -0700
PHOENIX-5390:Changing anonymous inner classes
Adding nit changes
Signed-off-by: s.kadam
---
.../org/apache/phoenix/execute/CorrelatePlan.java | 194 +++--
.../expression/function/InvertFunction.java| 88 +-
.../expression/function/PrefixFunction.java| 110 ++--
.../phoenix/iterate/OrderedResultIterator.java | 100 ++-
.../apache/phoenix/optimize/QueryOptimizer.java| 116 ++--
5 files changed, 323 insertions(+), 285 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
b/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
index b5491aa..68b1505 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
@@ -56,6 +56,7 @@ public class CorrelatePlan extends DelegateQueryPlan {
private final KeyValueSchema rhsSchema;
private final int rhsFieldPosition;
+
public CorrelatePlan(QueryPlan lhs, QueryPlan rhs, String variableId,
JoinType joinType, boolean isSingleValueOnly,
RuntimeContext runtimeContext, PTable joinedTable,
@@ -104,99 +105,7 @@ public class CorrelatePlan extends DelegateQueryPlan {
@Override
public ResultIterator iterator(final ParallelScanGrouper scanGrouper,
final Scan scan)
throws SQLException {
-return new ResultIterator() {
-private final ValueBitSet destBitSet =
ValueBitSet.newInstance(joinedSchema);
-private final ValueBitSet lhsBitSet =
ValueBitSet.newInstance(lhsSchema);
-private final ValueBitSet rhsBitSet =
-(joinType == JoinType.Semi || joinType == JoinType.Anti) ?
-ValueBitSet.EMPTY_VALUE_BITSET
- : ValueBitSet.newInstance(rhsSchema);
-private final ResultIterator iter = delegate.iterator(scanGrouper,
scan);
-private ResultIterator rhsIter = null;
-private Tuple current = null;
-private boolean closed = false;
-
-@Override
-public void close() throws SQLException {
-if (!closed) {
-closed = true;
-iter.close();
-if (rhsIter != null) {
-rhsIter.close();
-}
-}
-}
-
-@Override
-public Tuple next() throws SQLException {
-if (closed)
-return null;
-
-Tuple rhsCurrent = null;
-if (rhsIter != null) {
-rhsCurrent = rhsIter.next();
-if (rhsCurrent == null) {
-rhsIter.close();
-rhsIter = null;
-} else if (isSingleValueOnly) {
-throw new
SQLExceptionInfo.Builder(SQLExceptionCode.SINGLE_ROW_SUBQUERY_RETURNS_MULTIPLE_ROWS).build().buildException();
-}
-}
-while (rhsIter == null) {
-current = iter.next();
-if (current == null) {
-close();
-return null;
-}
-runtimeContext.setCorrelateVariableValue(variableId,
current);
-rhsIter = rhs.iterator();
-rhsCurrent = rhsIter.next();
-if ((rhsCurrent == null && (joinType == JoinType.Inner ||
joinType == JoinType.Semi))
-|| (rhsCurrent != null && joinType ==
JoinType.Anti)) {
-rhsIter.close();
-rhsIter = null;
-}
-}
-
-Tuple joined;
-try {
-joined = rhsBitSet == ValueBitSet.EMPTY_VALUE_BITSET ?
-current : TupleProjector.mergeProjectedValue(
-convertLhs(current), destBitSet,
-rhsCurrent, rhsBitSet, rhsFieldPosition,
true);
-} catch (IOException e) {
-throw new SQLException(e);
-}
-
-if ((joinType == JoinType.Semi || rhsCurrent == null) &&
rhsIter != null) {
-
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5390:Changing anonymous inner classes
This is an automated email from the ASF dual-hosted git repository.
skadam 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 089ca20 PHOENIX-5390:Changing anonymous inner classes
089ca20 is described below
commit 089ca20eb7e9e50464149135913fd38d61beb1e1
Author: Neha
AuthorDate: Fri Jul 26 11:43:01 2019 -0700
PHOENIX-5390:Changing anonymous inner classes
Adding nit changes
Signed-off-by: s.kadam
---
.../org/apache/phoenix/execute/CorrelatePlan.java | 194 +++--
.../expression/function/InvertFunction.java| 88 +-
.../expression/function/PrefixFunction.java| 110 ++--
.../phoenix/iterate/OrderedResultIterator.java | 100 ++-
.../apache/phoenix/optimize/QueryOptimizer.java| 116 ++--
5 files changed, 323 insertions(+), 285 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
b/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
index b5491aa..68b1505 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
@@ -56,6 +56,7 @@ public class CorrelatePlan extends DelegateQueryPlan {
private final KeyValueSchema rhsSchema;
private final int rhsFieldPosition;
+
public CorrelatePlan(QueryPlan lhs, QueryPlan rhs, String variableId,
JoinType joinType, boolean isSingleValueOnly,
RuntimeContext runtimeContext, PTable joinedTable,
@@ -104,99 +105,7 @@ public class CorrelatePlan extends DelegateQueryPlan {
@Override
public ResultIterator iterator(final ParallelScanGrouper scanGrouper,
final Scan scan)
throws SQLException {
-return new ResultIterator() {
-private final ValueBitSet destBitSet =
ValueBitSet.newInstance(joinedSchema);
-private final ValueBitSet lhsBitSet =
ValueBitSet.newInstance(lhsSchema);
-private final ValueBitSet rhsBitSet =
-(joinType == JoinType.Semi || joinType == JoinType.Anti) ?
-ValueBitSet.EMPTY_VALUE_BITSET
- : ValueBitSet.newInstance(rhsSchema);
-private final ResultIterator iter = delegate.iterator(scanGrouper,
scan);
-private ResultIterator rhsIter = null;
-private Tuple current = null;
-private boolean closed = false;
-
-@Override
-public void close() throws SQLException {
-if (!closed) {
-closed = true;
-iter.close();
-if (rhsIter != null) {
-rhsIter.close();
-}
-}
-}
-
-@Override
-public Tuple next() throws SQLException {
-if (closed)
-return null;
-
-Tuple rhsCurrent = null;
-if (rhsIter != null) {
-rhsCurrent = rhsIter.next();
-if (rhsCurrent == null) {
-rhsIter.close();
-rhsIter = null;
-} else if (isSingleValueOnly) {
-throw new
SQLExceptionInfo.Builder(SQLExceptionCode.SINGLE_ROW_SUBQUERY_RETURNS_MULTIPLE_ROWS).build().buildException();
-}
-}
-while (rhsIter == null) {
-current = iter.next();
-if (current == null) {
-close();
-return null;
-}
-runtimeContext.setCorrelateVariableValue(variableId,
current);
-rhsIter = rhs.iterator();
-rhsCurrent = rhsIter.next();
-if ((rhsCurrent == null && (joinType == JoinType.Inner ||
joinType == JoinType.Semi))
-|| (rhsCurrent != null && joinType ==
JoinType.Anti)) {
-rhsIter.close();
-rhsIter = null;
-}
-}
-
-Tuple joined;
-try {
-joined = rhsBitSet == ValueBitSet.EMPTY_VALUE_BITSET ?
-current : TupleProjector.mergeProjectedValue(
-convertLhs(current), destBitSet,
-rhsCurrent, rhsBitSet, rhsFieldPosition,
true);
-} catch (IOException e) {
-throw new SQLException(e);
-}
-
-if ((joinType == JoinType.Semi || rhsCurrent == null) &&
rhsIter != null) {
-
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5390:Changing anonymous inner classes
This is an automated email from the ASF dual-hosted git repository.
skadam 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 c38fb7c PHOENIX-5390:Changing anonymous inner classes
c38fb7c is described below
commit c38fb7c38e294358fd98c1c57b2ee661f289dd6f
Author: Neha
AuthorDate: Fri Jul 26 11:43:01 2019 -0700
PHOENIX-5390:Changing anonymous inner classes
Adding nit changes
Signed-off-by: s.kadam
---
.../org/apache/phoenix/execute/CorrelatePlan.java | 194 +++--
.../expression/function/InvertFunction.java| 88 +-
.../expression/function/PrefixFunction.java| 110 ++--
.../phoenix/iterate/OrderedResultIterator.java | 100 ++-
.../apache/phoenix/optimize/QueryOptimizer.java| 116 ++--
5 files changed, 323 insertions(+), 285 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
b/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
index b5491aa..68b1505 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
@@ -56,6 +56,7 @@ public class CorrelatePlan extends DelegateQueryPlan {
private final KeyValueSchema rhsSchema;
private final int rhsFieldPosition;
+
public CorrelatePlan(QueryPlan lhs, QueryPlan rhs, String variableId,
JoinType joinType, boolean isSingleValueOnly,
RuntimeContext runtimeContext, PTable joinedTable,
@@ -104,99 +105,7 @@ public class CorrelatePlan extends DelegateQueryPlan {
@Override
public ResultIterator iterator(final ParallelScanGrouper scanGrouper,
final Scan scan)
throws SQLException {
-return new ResultIterator() {
-private final ValueBitSet destBitSet =
ValueBitSet.newInstance(joinedSchema);
-private final ValueBitSet lhsBitSet =
ValueBitSet.newInstance(lhsSchema);
-private final ValueBitSet rhsBitSet =
-(joinType == JoinType.Semi || joinType == JoinType.Anti) ?
-ValueBitSet.EMPTY_VALUE_BITSET
- : ValueBitSet.newInstance(rhsSchema);
-private final ResultIterator iter = delegate.iterator(scanGrouper,
scan);
-private ResultIterator rhsIter = null;
-private Tuple current = null;
-private boolean closed = false;
-
-@Override
-public void close() throws SQLException {
-if (!closed) {
-closed = true;
-iter.close();
-if (rhsIter != null) {
-rhsIter.close();
-}
-}
-}
-
-@Override
-public Tuple next() throws SQLException {
-if (closed)
-return null;
-
-Tuple rhsCurrent = null;
-if (rhsIter != null) {
-rhsCurrent = rhsIter.next();
-if (rhsCurrent == null) {
-rhsIter.close();
-rhsIter = null;
-} else if (isSingleValueOnly) {
-throw new
SQLExceptionInfo.Builder(SQLExceptionCode.SINGLE_ROW_SUBQUERY_RETURNS_MULTIPLE_ROWS).build().buildException();
-}
-}
-while (rhsIter == null) {
-current = iter.next();
-if (current == null) {
-close();
-return null;
-}
-runtimeContext.setCorrelateVariableValue(variableId,
current);
-rhsIter = rhs.iterator();
-rhsCurrent = rhsIter.next();
-if ((rhsCurrent == null && (joinType == JoinType.Inner ||
joinType == JoinType.Semi))
-|| (rhsCurrent != null && joinType ==
JoinType.Anti)) {
-rhsIter.close();
-rhsIter = null;
-}
-}
-
-Tuple joined;
-try {
-joined = rhsBitSet == ValueBitSet.EMPTY_VALUE_BITSET ?
-current : TupleProjector.mergeProjectedValue(
-convertLhs(current), destBitSet,
-rhsCurrent, rhsBitSet, rhsFieldPosition,
true);
-} catch (IOException e) {
-throw new SQLException(e);
-}
-
-if ((joinType == JoinType.Semi || rhsCurrent == null) &&
rhsIter != null) {
-
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5390:Changing anonymous inner classes
This is an automated email from the ASF dual-hosted git repository.
skadam 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 58f1fa8 PHOENIX-5390:Changing anonymous inner classes
58f1fa8 is described below
commit 58f1fa833ceeda8b72449735ddb5e2c8547df764
Author: Neha
AuthorDate: Fri Jul 26 11:43:01 2019 -0700
PHOENIX-5390:Changing anonymous inner classes
Adding nit changes
Signed-off-by: s.kadam
---
.../org/apache/phoenix/execute/CorrelatePlan.java | 194 +++--
.../expression/function/InvertFunction.java| 88 +-
.../expression/function/PrefixFunction.java| 110 ++--
.../phoenix/iterate/OrderedResultIterator.java | 100 ++-
.../apache/phoenix/optimize/QueryOptimizer.java| 116 ++--
5 files changed, 323 insertions(+), 285 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
b/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
index b5491aa..68b1505 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
@@ -56,6 +56,7 @@ public class CorrelatePlan extends DelegateQueryPlan {
private final KeyValueSchema rhsSchema;
private final int rhsFieldPosition;
+
public CorrelatePlan(QueryPlan lhs, QueryPlan rhs, String variableId,
JoinType joinType, boolean isSingleValueOnly,
RuntimeContext runtimeContext, PTable joinedTable,
@@ -104,99 +105,7 @@ public class CorrelatePlan extends DelegateQueryPlan {
@Override
public ResultIterator iterator(final ParallelScanGrouper scanGrouper,
final Scan scan)
throws SQLException {
-return new ResultIterator() {
-private final ValueBitSet destBitSet =
ValueBitSet.newInstance(joinedSchema);
-private final ValueBitSet lhsBitSet =
ValueBitSet.newInstance(lhsSchema);
-private final ValueBitSet rhsBitSet =
-(joinType == JoinType.Semi || joinType == JoinType.Anti) ?
-ValueBitSet.EMPTY_VALUE_BITSET
- : ValueBitSet.newInstance(rhsSchema);
-private final ResultIterator iter = delegate.iterator(scanGrouper,
scan);
-private ResultIterator rhsIter = null;
-private Tuple current = null;
-private boolean closed = false;
-
-@Override
-public void close() throws SQLException {
-if (!closed) {
-closed = true;
-iter.close();
-if (rhsIter != null) {
-rhsIter.close();
-}
-}
-}
-
-@Override
-public Tuple next() throws SQLException {
-if (closed)
-return null;
-
-Tuple rhsCurrent = null;
-if (rhsIter != null) {
-rhsCurrent = rhsIter.next();
-if (rhsCurrent == null) {
-rhsIter.close();
-rhsIter = null;
-} else if (isSingleValueOnly) {
-throw new
SQLExceptionInfo.Builder(SQLExceptionCode.SINGLE_ROW_SUBQUERY_RETURNS_MULTIPLE_ROWS).build().buildException();
-}
-}
-while (rhsIter == null) {
-current = iter.next();
-if (current == null) {
-close();
-return null;
-}
-runtimeContext.setCorrelateVariableValue(variableId,
current);
-rhsIter = rhs.iterator();
-rhsCurrent = rhsIter.next();
-if ((rhsCurrent == null && (joinType == JoinType.Inner ||
joinType == JoinType.Semi))
-|| (rhsCurrent != null && joinType ==
JoinType.Anti)) {
-rhsIter.close();
-rhsIter = null;
-}
-}
-
-Tuple joined;
-try {
-joined = rhsBitSet == ValueBitSet.EMPTY_VALUE_BITSET ?
-current : TupleProjector.mergeProjectedValue(
-convertLhs(current), destBitSet,
-rhsCurrent, rhsBitSet, rhsFieldPosition,
true);
-} catch (IOException e) {
-throw new SQLException(e);
-}
-
-if ((joinType == JoinType.Semi || rhsCurrent == null) &&
rhsIter != null) {
-
[phoenix] annotated tag v4.14.3-HBase-1.3 updated (e299355 -> 8afe14a)
This is an automated email from the ASF dual-hosted git repository. skadam pushed a change to annotated tag v4.14.3-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git. *** WARNING: tag v4.14.3-HBase-1.3 was modified! *** from e299355 (commit) to 8afe14a (tag) tagging 77bba61d2f39c12e3283a5cddd0e8b4458054be9 (tag) length 161 bytes by s.kadam on Tue Aug 20 12:36:50 2019 -0700 - Log - Phoenix v4.14.3-HBase-1.3 release --- No new revisions were added by this update. Summary of changes:
[phoenix] 01/02: Set version to 4.14.3-HBase-1.3
This is an automated email from the ASF dual-hosted git repository. skadam pushed a commit to branch 4.14-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git commit 78b8f198b4f387d84ef81bbd83f0fe408ba35e4a Author: s.kadam AuthorDate: Tue Aug 20 16:54:21 2019 -0700 Set version to 4.14.3-HBase-1.3 --- phoenix-assembly/pom.xml | 2 +- phoenix-client/pom.xml | 2 +- phoenix-core/pom.xml | 2 +- phoenix-flume/pom.xml | 2 +- phoenix-hive/pom.xml | 2 +- phoenix-kafka/pom.xml | 2 +- phoenix-load-balancer/pom.xml | 2 +- phoenix-pherf/pom.xml | 2 +- phoenix-pig/pom.xml| 2 +- phoenix-queryserver-client/pom.xml | 2 +- phoenix-queryserver/pom.xml| 2 +- phoenix-server/pom.xml | 2 +- phoenix-spark/pom.xml | 2 +- phoenix-tracing-webapp/pom.xml | 2 +- pom.xml| 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index c3f7689..03a461c 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3-SNAPSHOT +4.14.3-HBase-1.3 phoenix-assembly Phoenix Assembly diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 40e178f..9eb58ab 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3-SNAPSHOT +4.14.3-HBase-1.3 phoenix-client Phoenix Client diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 5267dcf..d28422d 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -4,7 +4,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3-SNAPSHOT +4.14.3-HBase-1.3 phoenix-core Phoenix Core diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 88bc4e1..9218f5e 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3-SNAPSHOT +4.14.3-HBase-1.3 phoenix-flume Phoenix - Flume diff --git a/phoenix-hive/pom.xml b/phoenix-hive/pom.xml index 66bec76..133d460 100644 --- a/phoenix-hive/pom.xml +++ b/phoenix-hive/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3-SNAPSHOT +4.14.3-HBase-1.3 phoenix-hive Phoenix - Hive diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index 17c6c98..a40736f 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix - 4.14.3-HBase-1.3-SNAPSHOT + 4.14.3-HBase-1.3 phoenix-kafka Phoenix - Kafka diff --git a/phoenix-load-balancer/pom.xml b/phoenix-load-balancer/pom.xml index 4bd6c9d..649d258 100644 --- a/phoenix-load-balancer/pom.xml +++ b/phoenix-load-balancer/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3-SNAPSHOT +4.14.3-HBase-1.3 phoenix-load-balancer Phoenix Load Balancer diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 8ae2c3f..922fb0b 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -15,7 +15,7 @@ org.apache.phoenix phoenix - 4.14.3-HBase-1.3-SNAPSHOT + 4.14.3-HBase-1.3 phoenix-pherf diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index 99e6c00..cd0877a 100644 --- a/phoenix-pig/pom.xml +++ b/phoenix-pig/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3-SNAPSHOT +4.14.3-HBase-1.3 phoenix-pig Phoenix - Pig diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml index 5ee6a1a..da92514 100644 --- a/phoenix-queryserver-client/pom.xml +++ b/phoenix-queryserver-client/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3-SNAPSHOT +4.14.3-HBase-1.3 phoenix-queryserver-client Phoenix Query Server Client diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml index a2a10da..16ee47e 100644 --- a/phoenix-queryserver/pom.xml +++ b/phoenix-queryserver/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3-SNAPSHOT +4.14.3-HBase-1.3 phoenix-queryserver Phoenix Query Server diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index af16c55..6991c14 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3-SNAPSHOT +4.14.3-HBase-1.3 phoenix-server Phoenix Server diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml index e47348f..853af08 100644 --- a/phoenix-spark/pom.xml +++ b/phoenix-spark/pom.xml
[phoenix] 02/02: Set version to 4.14.4-HBase-1.3-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. skadam pushed a commit to branch 4.14-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git commit e8bbdfc3a2e827ea4ebe93721425e22c98f0d818 Author: s.kadam AuthorDate: Tue Aug 20 16:56:12 2019 -0700 Set version to 4.14.4-HBase-1.3-SNAPSHOT --- phoenix-assembly/pom.xml | 2 +- phoenix-client/pom.xml | 2 +- phoenix-core/pom.xml | 2 +- phoenix-flume/pom.xml | 2 +- phoenix-hive/pom.xml | 2 +- phoenix-kafka/pom.xml | 2 +- phoenix-load-balancer/pom.xml | 2 +- phoenix-pherf/pom.xml | 2 +- phoenix-pig/pom.xml| 2 +- phoenix-queryserver-client/pom.xml | 2 +- phoenix-queryserver/pom.xml| 2 +- phoenix-server/pom.xml | 2 +- phoenix-spark/pom.xml | 2 +- phoenix-tracing-webapp/pom.xml | 2 +- pom.xml| 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index 03a461c..fb67bb0 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3 +4.14.4-HBase-1.3-SNAPSHOT phoenix-assembly Phoenix Assembly diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 9eb58ab..143 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3 +4.14.4-HBase-1.3-SNAPSHOT phoenix-client Phoenix Client diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index d28422d..7ad2715 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -4,7 +4,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3 +4.14.4-HBase-1.3-SNAPSHOT phoenix-core Phoenix Core diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 9218f5e..5ba6a08 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3 +4.14.4-HBase-1.3-SNAPSHOT phoenix-flume Phoenix - Flume diff --git a/phoenix-hive/pom.xml b/phoenix-hive/pom.xml index 133d460..a0d628f 100644 --- a/phoenix-hive/pom.xml +++ b/phoenix-hive/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3 +4.14.4-HBase-1.3-SNAPSHOT phoenix-hive Phoenix - Hive diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index a40736f..48d597d 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix - 4.14.3-HBase-1.3 + 4.14.4-HBase-1.3-SNAPSHOT phoenix-kafka Phoenix - Kafka diff --git a/phoenix-load-balancer/pom.xml b/phoenix-load-balancer/pom.xml index 649d258..2aef1e0 100644 --- a/phoenix-load-balancer/pom.xml +++ b/phoenix-load-balancer/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3 +4.14.4-HBase-1.3-SNAPSHOT phoenix-load-balancer Phoenix Load Balancer diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 922fb0b..fa6336d 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -15,7 +15,7 @@ org.apache.phoenix phoenix - 4.14.3-HBase-1.3 + 4.14.4-HBase-1.3-SNAPSHOT phoenix-pherf diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index cd0877a..bdecf76 100644 --- a/phoenix-pig/pom.xml +++ b/phoenix-pig/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3 +4.14.4-HBase-1.3-SNAPSHOT phoenix-pig Phoenix - Pig diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml index da92514..7ae56b4 100644 --- a/phoenix-queryserver-client/pom.xml +++ b/phoenix-queryserver-client/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3 +4.14.4-HBase-1.3-SNAPSHOT phoenix-queryserver-client Phoenix Query Server Client diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml index 16ee47e..223d6b6 100644 --- a/phoenix-queryserver/pom.xml +++ b/phoenix-queryserver/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3 +4.14.4-HBase-1.3-SNAPSHOT phoenix-queryserver Phoenix Query Server diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 6991c14..af0ac00 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.3 +4.14.4-HBase-1.3-SNAPSHOT phoenix-server Phoenix Server diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml index 853af08..854d76b 100644 --- a/phoenix-spark/pom.xml +++ b/phoenix-spark
[phoenix] branch 4.14-HBase-1.3 updated (0cc879d -> e8bbdfc)
This is an automated email from the ASF dual-hosted git repository. skadam pushed a change to branch 4.14-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git. from 0cc879d PHOENIX-5441: NPE in phoenix-pherf/ConfigurationParserTest#testConfigReader (Mihir Monani) new 78b8f19 Set version to 4.14.3-HBase-1.3 new e8bbdfc Set version to 4.14.4-HBase-1.3-SNAPSHOT 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-assembly/pom.xml | 2 +- phoenix-client/pom.xml | 2 +- phoenix-core/pom.xml | 2 +- phoenix-flume/pom.xml | 2 +- phoenix-hive/pom.xml | 2 +- phoenix-kafka/pom.xml | 2 +- phoenix-load-balancer/pom.xml | 2 +- phoenix-pherf/pom.xml | 2 +- phoenix-pig/pom.xml| 2 +- phoenix-queryserver-client/pom.xml | 2 +- phoenix-queryserver/pom.xml| 2 +- phoenix-server/pom.xml | 2 +- phoenix-spark/pom.xml | 2 +- phoenix-tracing-webapp/pom.xml | 2 +- pom.xml| 2 +- 15 files changed, 15 insertions(+), 15 deletions(-)
[phoenix] 01/01: Set version to 4.14.4-HBase-1.4-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. skadam pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git commit 3402f75d27f563643d2b563418d2c6ad9ff8e49e Author: s.kadam AuthorDate: Tue Aug 20 17:03:07 2019 -0700 Set version to 4.14.4-HBase-1.4-SNAPSHOT --- phoenix-assembly/pom.xml | 2 +- phoenix-client/pom.xml | 2 +- phoenix-core/pom.xml | 2 +- phoenix-flume/pom.xml | 2 +- phoenix-hive/pom.xml | 2 +- phoenix-kafka/pom.xml | 2 +- phoenix-load-balancer/pom.xml | 2 +- phoenix-pherf/pom.xml | 2 +- phoenix-pig/pom.xml| 2 +- phoenix-queryserver-client/pom.xml | 2 +- phoenix-queryserver/pom.xml| 2 +- phoenix-server/pom.xml | 2 +- phoenix-spark/pom.xml | 2 +- phoenix-tracing-webapp/pom.xml | 2 +- pom.xml| 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index d844bd6..1410b85 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.4 +4.14.4-HBase-1.4-SNAPSHOT phoenix-assembly Phoenix Assembly diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 80afdb6..e25e55f 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.4 +4.14.4-HBase-1.4-SNAPSHOT phoenix-client Phoenix Client diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 879c818..483dc3b 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -4,7 +4,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.4 +4.14.4-HBase-1.4-SNAPSHOT phoenix-core Phoenix Core diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index ab2fe92..fa5a7de 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.4 +4.14.4-HBase-1.4-SNAPSHOT phoenix-flume Phoenix - Flume diff --git a/phoenix-hive/pom.xml b/phoenix-hive/pom.xml index 29f86f6..8fb225a 100644 --- a/phoenix-hive/pom.xml +++ b/phoenix-hive/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.4 +4.14.4-HBase-1.4-SNAPSHOT phoenix-hive Phoenix - Hive diff --git a/phoenix-kafka/pom.xml b/phoenix-kafka/pom.xml index 89046e7..a311410 100644 --- a/phoenix-kafka/pom.xml +++ b/phoenix-kafka/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix - 4.14.3-HBase-1.4 + 4.14.4-HBase-1.4-SNAPSHOT phoenix-kafka Phoenix - Kafka diff --git a/phoenix-load-balancer/pom.xml b/phoenix-load-balancer/pom.xml index 2a75ab9..9b09396 100644 --- a/phoenix-load-balancer/pom.xml +++ b/phoenix-load-balancer/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.4 +4.14.4-HBase-1.4-SNAPSHOT phoenix-load-balancer Phoenix Load Balancer diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 1fc5205..9d91d56 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -15,7 +15,7 @@ org.apache.phoenix phoenix - 4.14.3-HBase-1.4 + 4.14.4-HBase-1.4-SNAPSHOT phoenix-pherf diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index b5ccebf..d8509f9 100644 --- a/phoenix-pig/pom.xml +++ b/phoenix-pig/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.4 +4.14.4-HBase-1.4-SNAPSHOT phoenix-pig Phoenix - Pig diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml index 90ce5ff..0e5b9ea 100644 --- a/phoenix-queryserver-client/pom.xml +++ b/phoenix-queryserver-client/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.4 +4.14.4-HBase-1.4-SNAPSHOT phoenix-queryserver-client Phoenix Query Server Client diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml index a13e12a..464847f 100644 --- a/phoenix-queryserver/pom.xml +++ b/phoenix-queryserver/pom.xml @@ -26,7 +26,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.4 +4.14.4-HBase-1.4-SNAPSHOT phoenix-queryserver Phoenix Query Server diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 03b1a78..03c9d61 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix -4.14.3-HBase-1.4 +4.14.4-HBase-1.4-SNAPSHOT phoenix-server Phoenix Server diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml index 8f5bd41..0ce2b70 100644 --- a/phoenix-spark/pom.xml +++ b/phoenix-spark
[phoenix] branch 4.14-HBase-1.4 updated (e5c4813 -> 3402f75)
This is an automated email from the ASF dual-hosted git repository. skadam pushed a change to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git. from e5c4813 PHOENIX-5441: NPE in phoenix-pherf/ConfigurationParserTest#testConfigReader (Mihir Monani) add eb54245 Set version to 4.14.3-HBase-1.4 new 3402f75 Set version to 4.14.4-HBase-1.4-SNAPSHOT The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: phoenix-assembly/pom.xml | 2 +- phoenix-client/pom.xml | 2 +- phoenix-core/pom.xml | 2 +- phoenix-flume/pom.xml | 2 +- phoenix-hive/pom.xml | 2 +- phoenix-kafka/pom.xml | 2 +- phoenix-load-balancer/pom.xml | 2 +- phoenix-pherf/pom.xml | 2 +- phoenix-pig/pom.xml| 2 +- phoenix-queryserver-client/pom.xml | 2 +- phoenix-queryserver/pom.xml| 2 +- phoenix-server/pom.xml | 2 +- phoenix-spark/pom.xml | 2 +- phoenix-tracing-webapp/pom.xml | 2 +- pom.xml| 2 +- 15 files changed, 15 insertions(+), 15 deletions(-)
[phoenix] annotated tag v4.14.3-HBase-1.4 updated (eb54245 -> 5cd1986)
This is an automated email from the ASF dual-hosted git repository. skadam pushed a change to annotated tag v4.14.3-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git. *** WARNING: tag v4.14.3-HBase-1.4 was modified! *** from eb54245 (commit) to 5cd1986 (tag) tagging d7d5eb5f87766bd261698c547ff7a66335b548ce (tag) length 161 bytes by s.kadam on Tue Aug 20 12:39:21 2019 -0700 - Log - Phoenix v4.14.3-HBase-1.4 release --- No new revisions were added by this update. Summary of changes:
svn commit: r1865585 - in /phoenix/site: publish/download.html source/src/site/markdown/download.md
Author: skadam Date: Wed Aug 21 00:55:19 2019 New Revision: 1865585 URL: http://svn.apache.org/viewvc?rev=1865585=rev Log: Update download page for 4.14.3 release Modified: phoenix/site/publish/download.html phoenix/site/source/src/site/markdown/download.md Modified: phoenix/site/publish/download.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/download.html?rev=1865585=1865584=1865585=diff == --- phoenix/site/publish/download.html (original) +++ phoenix/site/publish/download.html Wed Aug 21 00:55:19 2019 @@ -1,7 +1,7 @@ @@ -167,7 +167,7 @@ Phoenix Downloads The below table lists mirrored release artifacts and their associated hashes and signatures available ONLY at apache.org. The keys used to sign releases can be found in our published https://www.apache.org/dist/phoenix/KEYS;>KEYS file. See our installation instructions here, our release notes here, and a list of fixes and new features https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12334393projectId=12315120;>here. Follow https://www.apache.org/dyn/closer.cgi#verify;>Verify the Integrity of the Files for how to verify your mirrored downloads. -Current release 4.14.2 can run on Apache HBase 1.3 and 1.4. CDH HBase 5.11, 5.12, 5.13 and 5.14 is supported by 4.14.0. Apache HBase 2.0 is supported by 5.0.0. Please follow the appropriate link depending on your HBase version. +Current release 4.14.3 can run on Apache HBase 1.3 and 1.4. CDH HBase 5.11, 5.12, 5.13 and 5.14 is supported by 4.14.0. Apache HBase 2.0 is supported by 5.0.0. Please follow the appropriate link depending on your HBase version. @@ -184,8 +184,8 @@
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5455 - IndexedKeyValue creation fails after HBASE-22034 (Geoffrey Jacoby)
This is an automated email from the ASF dual-hosted git repository.
skadam 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 df3cc54 PHOENIX-5455 - IndexedKeyValue creation fails after
HBASE-22034 (Geoffrey Jacoby)
df3cc54 is described below
commit df3cc54fb5ba4836a61983de9b607ec6b5e08cca
Author: s.kadam
AuthorDate: Thu Aug 29 12:39:45 2019 -0700
PHOENIX-5455 - IndexedKeyValue creation fails after HBASE-22034 (Geoffrey
Jacoby)
---
.../org/apache/phoenix/hbase/index/Indexer.java| 21 +---
.../phoenix/hbase/index/wal/IndexedKeyValue.java | 128 ++---
.../phoenix/hbase/index/wal/KeyValueCodec.java | 17 ++-
.../regionserver/wal/IndexedKeyValueTest.java | 51 ++--
.../wal/ReadWriteKeyValuesWithCodecTest.java | 4 +-
5 files changed, 93 insertions(+), 128 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java
index ff8b555..a3a5874 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java
@@ -534,11 +534,13 @@ public class Indexer extends BaseRegionObserver {
if (durability != Durability.SKIP_WAL) {
// we have all the WAL durability, so we just update the WAL
entry and move on
for (Pair entry : indexUpdates) {
-edit.add(new IndexedKeyValue(entry.getSecond(),
entry.getFirst()));
+
edit.add(IndexedKeyValue.newIndexedKeyValue(entry.getSecond(),
+ entry.getFirst()));
+ }
}
}
}
- }
+
}
private void
setBatchMutateContext(ObserverContext c,
BatchMutateContext context) {
@@ -630,21 +632,6 @@ public class Indexer extends BaseRegionObserver {
}
/**
- * Search the {@link WALEdit} for the first {@link IndexedKeyValue} present
- * @param edit {@link WALEdit}
- * @return the first {@link IndexedKeyValue} in the {@link WALEdit} or
null if not
- * present
- */
- private IndexedKeyValue getFirstIndexedKeyValue(WALEdit edit) {
-for (Cell kv : edit.getCells()) {
- if (kv instanceof IndexedKeyValue) {
-return (IndexedKeyValue) kv;
- }
-}
-return null;
- }
-
- /**
* Extract the index updates from the WAL Edit
* @param edit to search for index updates
* @return the mutations to apply to the index tables
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..33daad4 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
@@ -23,6 +23,8 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Arrays;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Mutation;
@@ -50,13 +52,36 @@ public class IndexedKeyValue extends KeyValue {
private boolean batchFinished = false;
private int hashCode;
-public IndexedKeyValue() {}
+public static IndexedKeyValue newIndexedKeyValue(byte[] bs, Mutation m){
+Cell indexWALCell = adaptFirstCellFromMutation(m);
+return new IndexedKeyValue(indexWALCell, bs, m);
+}
+
+private static Cell adaptFirstCellFromMutation(Mutation m) {
+if (m != null && m.getFamilyCellMap() != null &&
+m.getFamilyCellMap().firstEntry() != null &&
+m.getFamilyCellMap().firstEntry().getValue() != null
+&& m.getFamilyCellMap().firstEntry().getValue().get(0) != null) {
+//have to replace the column family with WALEdit.METAFAMILY to
make sure
+//that IndexedKeyValues don't get replicated. The superclass
KeyValue fields
+//like row, qualifier and value are placeholders to prevent NPEs
+// when using the KeyValue APIs. See PHOENIX-5188 / 5455
+Cell mutationCell =
m.getFamilyCellMap().firstEntry().getValue().get(0);
+return CellUtil.createCell(m.getRow(), WALEdit.METAFAMILY,
+mutationCell.getQualifierArray(), mutationCell.getTimestamp(),
+mutationCell.getTypeByte(), mutationCell.getValueArray());
+} else {
+throw new IllegalArgumentException("Tried to create an
IndexedKeyValue with a " +
+"Mutation with no Cells!")
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5415: NPE in getting conf from addHbaseResources in IndexUpgradeTool
This is an automated email from the ASF dual-hosted git repository.
skadam 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 8fb79cf PHOENIX-5415: NPE in getting conf from addHbaseResources in
IndexUpgradeTool
8fb79cf is described below
commit 8fb79cf63c4feefacb0a6c66a5822d7f9453968b
Author: s.kadam
AuthorDate: Sun Jul 28 21:01:18 2019 -0700
PHOENIX-5415: NPE in getting conf from addHbaseResources in IndexUpgradeTool
---
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 135 +
1 file changed, 83 insertions(+), 52 deletions(-)
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 9a76b9b..5d0ebed 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
@@ -18,6 +18,7 @@
package org.apache.phoenix.mapreduce.index;
import com.google.common.annotations.VisibleForTesting;
+import com.google.gson.Gson;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
@@ -32,6 +33,8 @@ import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.util.Tool;
+import org.apache.hadoop.util.ToolRunner;
import org.apache.phoenix.hbase.index.IndexRegionObserver;
import org.apache.phoenix.hbase.index.Indexer;
import org.apache.phoenix.hbase.index.covered.NonTxIndexBuilder;
@@ -55,6 +58,7 @@ import java.util.HashSet;
import java.util.logging.Logger;
import org.apache.hadoop.conf.Configuration;
import org.apache.phoenix.util.SchemaUtil;
+import org.apache.phoenix.util.StringUtil;
import java.io.IOException;
import java.nio.file.Files;
@@ -70,7 +74,7 @@ import java.util.logging.SimpleFormatter;
import static org.apache.phoenix.query.QueryServicesOptions.
GLOBAL_INDEX_CHECKER_ENABLED_MAP_EXPIRATION_MIN;
-public class IndexUpgradeTool extends Configured {
+public class IndexUpgradeTool extends Configured implements Tool {
private static final Logger LOGGER =
Logger.getLogger(IndexUpgradeTool.class.getName());
@@ -145,21 +149,6 @@ public class IndexUpgradeTool extends Configured {
return operation;
}
-public static void main (String[] args) {
-CommandLine cmdLine = null;
-
-IndexUpgradeTool iut = new IndexUpgradeTool();
-try {
-cmdLine = iut.parseOptions(args);
-LOGGER.info("Index Upgrade tool initiated: "+ StringUtils.join(
args,","));
-} catch (IllegalStateException e) {
-iut.printHelpAndExit(e.getMessage(), iut.getOptions());
-}
-iut.initializeTool(cmdLine);
-iut.prepareToolSetup();
-iut.executeTool();
-}
-
public IndexUpgradeTool(String mode, String tables, String inputFile,
String outputFile, boolean dryRun, IndexTool indexTool) {
this.operation = mode;
@@ -172,6 +161,21 @@ public class IndexUpgradeTool extends Configured {
public IndexUpgradeTool () { }
+@Override
+public int run(String[] args) throws Exception {
+CommandLine cmdLine = null;
+try {
+cmdLine = parseOptions(args);
+LOGGER.info("Index Upgrade tool initiated: " + StringUtils.join(
args, ","));
+} catch (IllegalStateException e) {
+printHelpAndExit(e.getMessage(), getOptions());
+}
+initializeTool(cmdLine);
+prepareToolSetup();
+executeTool();
+return 0;
+}
+
/**
* Parses the commandline arguments, throws IllegalStateException if
mandatory arguments are
* missing.
@@ -288,7 +292,7 @@ public class IndexUpgradeTool extends Configured {
LOGGER.info("This is the beginning of the tool with dry run.");
}
} catch (IOException e) {
-LOGGER.severe("Something went wrong "+e);
+LOGGER.severe("Something went wrong " + e);
System.exit(-1);
}
}
@@ -324,12 +328,12 @@ public class IndexUpgradeTool extends Configured {
try (Admin admin = queryServices.getAdmin()) {
PTable dataTable = PhoenixRuntime.getTableNoCache(conn,
dataTableFullName);
-LOGGER.fine("Executing " + operation + " for " +
dataTableFullName);
+LOGGER.info("Executing " + operation + " for " +
dataTableFullName);
boolean mutable = !(dataTable.
[phoenix] branch master updated: PHOENIX-5415: NPE in getting conf from addHbaseResources in IndexUpgradeTool
This is an automated email from the ASF dual-hosted git repository.
skadam 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 0b5eddc PHOENIX-5415: NPE in getting conf from addHbaseResources in
IndexUpgradeTool
0b5eddc is described below
commit 0b5eddc38a566b2c83cc30aff5a1b9f679efdad0
Author: s.kadam
AuthorDate: Sun Jul 28 20:47:54 2019 -0700
PHOENIX-5415: NPE in getting conf from addHbaseResources in IndexUpgradeTool
---
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 141 +
1 file changed, 88 insertions(+), 53 deletions(-)
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 861fb66..daac604 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
@@ -18,6 +18,7 @@
package org.apache.phoenix.mapreduce.index;
import com.google.common.annotations.VisibleForTesting;
+import com.google.gson.Gson;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
@@ -26,6 +27,8 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.hadoop.conf.Configured;
+import org.apache.hadoop.util.Tool;
+import org.apache.hadoop.util.ToolRunner;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.TableName;
@@ -55,6 +58,7 @@ import java.util.List;
import java.util.logging.Logger;
import org.apache.hadoop.conf.Configuration;
import org.apache.phoenix.util.SchemaUtil;
+import org.apache.phoenix.util.StringUtil;
import java.io.IOException;
import java.nio.file.Files;
@@ -70,7 +74,7 @@ import java.util.stream.Collectors;
import static
org.apache.phoenix.query.QueryServicesOptions.GLOBAL_INDEX_CHECKER_ENABLED_MAP_EXPIRATION_MIN;
-public class IndexUpgradeTool extends Configured {
+public class IndexUpgradeTool extends Configured implements Tool {
private static final Logger LOGGER =
Logger.getLogger(IndexUpgradeTool.class.getName());
@@ -145,21 +149,6 @@ public class IndexUpgradeTool extends Configured {
return operation;
}
-public static void main (String[] args) {
-CommandLine cmdLine = null;
-
-IndexUpgradeTool iut = new IndexUpgradeTool();
-try {
-cmdLine = iut.parseOptions(args);
-LOGGER.info("Index Upgrade tool initiated: "+ String.join(",",
args));
-} catch (IllegalStateException e) {
-iut.printHelpAndExit(e.getMessage(), iut.getOptions());
-}
-iut.initializeTool(cmdLine);
-iut.prepareToolSetup();
-iut.executeTool();
-}
-
public IndexUpgradeTool(String mode, String tables, String inputFile,
String outputFile, boolean dryRun, IndexTool indexTool) {
this.operation = mode;
@@ -172,6 +161,21 @@ public class IndexUpgradeTool extends Configured {
public IndexUpgradeTool () { }
+@Override
+public int run(String[] args) throws Exception {
+CommandLine cmdLine = null;
+try {
+cmdLine = parseOptions(args);
+LOGGER.info("Index Upgrade tool initiated: " + String.join(",",
args));
+} catch (IllegalStateException e) {
+printHelpAndExit(e.getMessage(), getOptions());
+}
+initializeTool(cmdLine);
+prepareToolSetup();
+executeTool();
+return 0;
+}
+
/**
* Parses the commandline arguments, throws IllegalStateException if
mandatory arguments are
* missing.
@@ -329,7 +333,7 @@ public class IndexUpgradeTool extends Configured {
boolean mutable = !(dataTable.isImmutableRows());
if (!mutable) {
LOGGER.fine("Data table is immutable, waiting for "
-+ GLOBAL_INDEX_CHECKER_ENABLED_MAP_EXPIRATION_MIN
+ 1
++ (GLOBAL_INDEX_CHECKER_ENABLED_MAP_EXPIRATION_MIN
+ 1)
+ " minutes for client cache to expire");
if (!test) {
Thread.sleep(
@@ -368,7 +372,7 @@ public class IndexUpgradeTool extends Configured {
}
LOGGER.info("Disabled data table " + dataTable);
} else {
-LOGGER.info( "Data table " + dataTable +" is already disabled");
+LOGGER.info( "Data table " + dataTable + " is already disabled");
}
for (String indexName : indexes) {
if (a
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5415: NPE in getting conf from addHbaseResources in IndexUpgradeTool
This is an automated email from the ASF dual-hosted git repository.
skadam 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 343b418 PHOENIX-5415: NPE in getting conf from addHbaseResources in
IndexUpgradeTool
343b418 is described below
commit 343b418c9bfa873bf68dbb831159d4a6badbc469
Author: s.kadam
AuthorDate: Sun Jul 28 21:01:18 2019 -0700
PHOENIX-5415: NPE in getting conf from addHbaseResources in IndexUpgradeTool
---
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 135 +
1 file changed, 83 insertions(+), 52 deletions(-)
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 9a76b9b..5d0ebed 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
@@ -18,6 +18,7 @@
package org.apache.phoenix.mapreduce.index;
import com.google.common.annotations.VisibleForTesting;
+import com.google.gson.Gson;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
@@ -32,6 +33,8 @@ import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.util.Tool;
+import org.apache.hadoop.util.ToolRunner;
import org.apache.phoenix.hbase.index.IndexRegionObserver;
import org.apache.phoenix.hbase.index.Indexer;
import org.apache.phoenix.hbase.index.covered.NonTxIndexBuilder;
@@ -55,6 +58,7 @@ import java.util.HashSet;
import java.util.logging.Logger;
import org.apache.hadoop.conf.Configuration;
import org.apache.phoenix.util.SchemaUtil;
+import org.apache.phoenix.util.StringUtil;
import java.io.IOException;
import java.nio.file.Files;
@@ -70,7 +74,7 @@ import java.util.logging.SimpleFormatter;
import static org.apache.phoenix.query.QueryServicesOptions.
GLOBAL_INDEX_CHECKER_ENABLED_MAP_EXPIRATION_MIN;
-public class IndexUpgradeTool extends Configured {
+public class IndexUpgradeTool extends Configured implements Tool {
private static final Logger LOGGER =
Logger.getLogger(IndexUpgradeTool.class.getName());
@@ -145,21 +149,6 @@ public class IndexUpgradeTool extends Configured {
return operation;
}
-public static void main (String[] args) {
-CommandLine cmdLine = null;
-
-IndexUpgradeTool iut = new IndexUpgradeTool();
-try {
-cmdLine = iut.parseOptions(args);
-LOGGER.info("Index Upgrade tool initiated: "+ StringUtils.join(
args,","));
-} catch (IllegalStateException e) {
-iut.printHelpAndExit(e.getMessage(), iut.getOptions());
-}
-iut.initializeTool(cmdLine);
-iut.prepareToolSetup();
-iut.executeTool();
-}
-
public IndexUpgradeTool(String mode, String tables, String inputFile,
String outputFile, boolean dryRun, IndexTool indexTool) {
this.operation = mode;
@@ -172,6 +161,21 @@ public class IndexUpgradeTool extends Configured {
public IndexUpgradeTool () { }
+@Override
+public int run(String[] args) throws Exception {
+CommandLine cmdLine = null;
+try {
+cmdLine = parseOptions(args);
+LOGGER.info("Index Upgrade tool initiated: " + StringUtils.join(
args, ","));
+} catch (IllegalStateException e) {
+printHelpAndExit(e.getMessage(), getOptions());
+}
+initializeTool(cmdLine);
+prepareToolSetup();
+executeTool();
+return 0;
+}
+
/**
* Parses the commandline arguments, throws IllegalStateException if
mandatory arguments are
* missing.
@@ -288,7 +292,7 @@ public class IndexUpgradeTool extends Configured {
LOGGER.info("This is the beginning of the tool with dry run.");
}
} catch (IOException e) {
-LOGGER.severe("Something went wrong "+e);
+LOGGER.severe("Something went wrong " + e);
System.exit(-1);
}
}
@@ -324,12 +328,12 @@ public class IndexUpgradeTool extends Configured {
try (Admin admin = queryServices.getAdmin()) {
PTable dataTable = PhoenixRuntime.getTableNoCache(conn,
dataTableFullName);
-LOGGER.fine("Executing " + operation + " for " +
dataTableFullName);
+LOGGER.info("Executing " + operation + " for " +
dataTableFullName);
boolean mutable = !(dataTable.
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5415: NPE in getting conf from addHbaseResources in IndexUpgradeTool
This is an automated email from the ASF dual-hosted git repository.
skadam 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 53c0810 PHOENIX-5415: NPE in getting conf from addHbaseResources in
IndexUpgradeTool
53c0810 is described below
commit 53c0810639431c22bb923a30632710bbc4e7af63
Author: s.kadam
AuthorDate: Sun Jul 28 21:01:18 2019 -0700
PHOENIX-5415: NPE in getting conf from addHbaseResources in IndexUpgradeTool
---
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 135 +
1 file changed, 83 insertions(+), 52 deletions(-)
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 9a76b9b..5d0ebed 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
@@ -18,6 +18,7 @@
package org.apache.phoenix.mapreduce.index;
import com.google.common.annotations.VisibleForTesting;
+import com.google.gson.Gson;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
@@ -32,6 +33,8 @@ import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.util.Tool;
+import org.apache.hadoop.util.ToolRunner;
import org.apache.phoenix.hbase.index.IndexRegionObserver;
import org.apache.phoenix.hbase.index.Indexer;
import org.apache.phoenix.hbase.index.covered.NonTxIndexBuilder;
@@ -55,6 +58,7 @@ import java.util.HashSet;
import java.util.logging.Logger;
import org.apache.hadoop.conf.Configuration;
import org.apache.phoenix.util.SchemaUtil;
+import org.apache.phoenix.util.StringUtil;
import java.io.IOException;
import java.nio.file.Files;
@@ -70,7 +74,7 @@ import java.util.logging.SimpleFormatter;
import static org.apache.phoenix.query.QueryServicesOptions.
GLOBAL_INDEX_CHECKER_ENABLED_MAP_EXPIRATION_MIN;
-public class IndexUpgradeTool extends Configured {
+public class IndexUpgradeTool extends Configured implements Tool {
private static final Logger LOGGER =
Logger.getLogger(IndexUpgradeTool.class.getName());
@@ -145,21 +149,6 @@ public class IndexUpgradeTool extends Configured {
return operation;
}
-public static void main (String[] args) {
-CommandLine cmdLine = null;
-
-IndexUpgradeTool iut = new IndexUpgradeTool();
-try {
-cmdLine = iut.parseOptions(args);
-LOGGER.info("Index Upgrade tool initiated: "+ StringUtils.join(
args,","));
-} catch (IllegalStateException e) {
-iut.printHelpAndExit(e.getMessage(), iut.getOptions());
-}
-iut.initializeTool(cmdLine);
-iut.prepareToolSetup();
-iut.executeTool();
-}
-
public IndexUpgradeTool(String mode, String tables, String inputFile,
String outputFile, boolean dryRun, IndexTool indexTool) {
this.operation = mode;
@@ -172,6 +161,21 @@ public class IndexUpgradeTool extends Configured {
public IndexUpgradeTool () { }
+@Override
+public int run(String[] args) throws Exception {
+CommandLine cmdLine = null;
+try {
+cmdLine = parseOptions(args);
+LOGGER.info("Index Upgrade tool initiated: " + StringUtils.join(
args, ","));
+} catch (IllegalStateException e) {
+printHelpAndExit(e.getMessage(), getOptions());
+}
+initializeTool(cmdLine);
+prepareToolSetup();
+executeTool();
+return 0;
+}
+
/**
* Parses the commandline arguments, throws IllegalStateException if
mandatory arguments are
* missing.
@@ -288,7 +292,7 @@ public class IndexUpgradeTool extends Configured {
LOGGER.info("This is the beginning of the tool with dry run.");
}
} catch (IOException e) {
-LOGGER.severe("Something went wrong "+e);
+LOGGER.severe("Something went wrong " + e);
System.exit(-1);
}
}
@@ -324,12 +328,12 @@ public class IndexUpgradeTool extends Configured {
try (Admin admin = queryServices.getAdmin()) {
PTable dataTable = PhoenixRuntime.getTableNoCache(conn,
dataTableFullName);
-LOGGER.fine("Executing " + operation + " for " +
dataTableFullName);
+LOGGER.info("Executing " + operation + " for " +
dataTableFullName);
boolean mutable = !(dataTable.
[phoenix] annotated tag 4.14.3-HBase-1.4-rc0 updated (2997bfb -> efd8fa7)
This is an automated email from the ASF dual-hosted git repository. skadam pushed a change to annotated tag 4.14.3-HBase-1.4-rc0 in repository https://gitbox.apache.org/repos/asf/phoenix.git. *** WARNING: tag 4.14.3-HBase-1.4-rc0 was modified! *** from 2997bfb (commit) to efd8fa7 (tag) tagging 2997bfb3c318825a5264ecee72e4214112a10151 (commit) replaces v4.14.2-HBase-1.4 by s.kadam on Sun Jul 28 15:41:43 2019 -0700 - Log - 4.14.3-HBase-1.4-rc0 --- No new revisions were added by this update. Summary of changes:
svn commit: r35047 - in /dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0: ./ bin/ src/
Author: skadam Date: Sun Jul 28 22:56:29 2019 New Revision: 35047 Log: RC for 4.14.3-HBase-1.4 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz (with props) dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.asc dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha256 dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha512 dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/src/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz (with props) dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.asc dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.sha256 dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.sha512 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.asc == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.asc (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.asc Sun Jul 28 22:56:29 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEU7Kwsh8ErH62QWeCSLeAfZXxJ7UFAl0+JBQACgkQSLeAfZXx +J7U77Q/8C/TjGdewteahef7p39jhExbwEMBdyfJdKPWtmaC9yw5uoQMLWKuktmz4 +CVbPH/CMdpKRbRbN8TfwuVvrxZVVIEUqpRU6KS2S73zGjWVnGs9E/23PK744nL1C +JKLBenoZQplp5tIaAqiEori5wmwBqtx+fOQhUkTWR/+3r2Lu0ksNTKRx0DYTQgQ9 +YhMGVBqaTWi8beDr4cF/4TQm6SnWQEMNxx2nLkj5d2AdYFG2c/KCQPrGYs/B1WFr +uyLBIB9sWLo6g57fMrPJCUkFZfsfKMc0NBxJ7h7iY2mts1Hyl6gVChILFbiAI0/U +Q8CEbMIYYj+MNjx+U33yu4nypmIn5oVNcW7oj6txa7ygA3IVHybjSkZ3/fpMr+Sa +MBLbG1HHQeDpRAM0U+rGJIsMdXW+jskHxo/QCtRsZyUJgVnN7b6AHOx5XJCa0nYc +BQ6af/nGhm0dxCu4g31TPhxl9tLvJw0t1c2zVO8QmXLYbkSAwEct0+1irRURA9FT +33eHVMXvUU64+R4eNeSQ3MYn7hHE8BvmVcAIZZW9I32WBpQKYGpNGd2rZfISyKqy +VlC1/GFcOMGugWbgXsOw/qZiHYj8NNzg7SahUVgz9pr+tYSwbzskdKzPOBTHNMJS +rHXJA930BNSnBB2qAY6YKa+eB2lpFlRGEMQCuoUi/r4kmNjodrM= +=LzPT +-END PGP SIGNATURE- Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha256 == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha256 (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha256 Sun Jul 28 22:56:29 2019 @@ -0,0 +1 @@ +SHA256(apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz)= 227df8d3ca3158b9886b3fef75fd5d7b1a157a5cb12af2d11822f83d549c7fbf Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha512 == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha512 (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha512 Sun Jul 28 22:56:29 2019 @@ -0,0 +1 @@ +SHA512(apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz)= 7a588b578fb9eb167208c72b31c500cec1172ae7e9e5164ed6df9600fc2672f905b701e58867ae46979e4882658e6d5807f450b37fd2973ff0733ce3c944772d Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.asc == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.asc (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc0/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.asc Sun Jul 28 22:56:29 2019 @@ -0,0 +1,16
[phoenix] branch 4.14-HBase-1.3 updated: PHOENIX-5415: NPE in getting conf from addHbaseResources in IndexUpgradeTool (#551)
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.3 by this push:
new 1e534c2 PHOENIX-5415: NPE in getting conf from addHbaseResources in
IndexUpgradeTool (#551)
1e534c2 is described below
commit 1e534c2c2f9df6b8da04ef305832fca58502389c
Author: Swaroopa Kadam
AuthorDate: Sun Jul 28 13:59:51 2019 -0700
PHOENIX-5415: NPE in getting conf from addHbaseResources in
IndexUpgradeTool (#551)
---
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 148 +
1 file changed, 93 insertions(+), 55 deletions(-)
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 7855c40..10d9caf 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
@@ -18,6 +18,7 @@
package org.apache.phoenix.mapreduce.index;
import com.google.common.annotations.VisibleForTesting;
+import com.google.gson.Gson;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
@@ -32,6 +33,8 @@ import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.util.Tool;
+import org.apache.hadoop.util.ToolRunner;
import org.apache.phoenix.hbase.index.IndexRegionObserver;
import org.apache.phoenix.hbase.index.Indexer;
import org.apache.phoenix.hbase.index.covered.NonTxIndexBuilder;
@@ -55,6 +58,7 @@ import java.util.HashSet;
import java.util.logging.Logger;
import org.apache.hadoop.conf.Configuration;
import org.apache.phoenix.util.SchemaUtil;
+import org.apache.phoenix.util.StringUtil;
import java.io.IOException;
import java.nio.file.Files;
@@ -70,7 +74,7 @@ import java.util.logging.SimpleFormatter;
import static org.apache.phoenix.query.QueryServicesOptions
.GLOBAL_INDEX_CHECKER_ENABLED_MAP_EXPIRATION_MIN;
-public class IndexUpgradeTool extends Configured {
+public class IndexUpgradeTool extends Configured implements Tool {
private static final Logger LOGGER =
Logger.getLogger(IndexUpgradeTool.class.getName());
@@ -145,21 +149,6 @@ public class IndexUpgradeTool extends Configured {
return operation;
}
-public static void main (String[] args) {
-CommandLine cmdLine = null;
-
-IndexUpgradeTool iut = new IndexUpgradeTool();
-try {
-cmdLine = iut.parseOptions(args);
-LOGGER.info("Index Upgrade tool initiated: "+ StringUtils.join(
args, ","));
-} catch (IllegalStateException e) {
-iut.printHelpAndExit(e.getMessage(), iut.getOptions());
-}
-iut.initializeTool(cmdLine);
-iut.prepareToolSetup();
-iut.executeTool();
-}
-
public IndexUpgradeTool(String mode, String tables, String inputFile,
String outputFile, boolean dryRun, IndexTool indexTool) {
this.operation = mode;
@@ -172,6 +161,21 @@ public class IndexUpgradeTool extends Configured {
public IndexUpgradeTool () { }
+@Override
+public int run(String[] args) throws Exception {
+CommandLine cmdLine = null;
+try {
+cmdLine = parseOptions(args);
+LOGGER.info("Index Upgrade tool initiated: " + StringUtils.join(
args, ","));
+} catch (IllegalStateException e) {
+printHelpAndExit(e.getMessage(), getOptions());
+}
+initializeTool(cmdLine);
+prepareToolSetup();
+executeTool();
+return 0;
+}
+
/**
* Parses the commandline arguments, throws IllegalStateException if
mandatory arguments are
* missing.
@@ -324,12 +328,12 @@ public class IndexUpgradeTool extends Configured {
try (Admin admin = queryServices.getAdmin()) {
PTable dataTable = PhoenixRuntime.getTableNoCache(conn,
dataTableFullName);
-LOGGER.fine("Executing " + operation + " for " +
dataTableFullName);
+LOGGER.info("Executing " + operation + " for " +
dataTableFullName);
boolean mutable = !(dataTable.isImmutableRows());
if (!mutable) {
-LOGGER.fine("Data table is immutable, waiting for "
-+ GLOBAL_INDEX_CHECKER_ENABLED_MAP_EXPIRATION_MIN
+ 1
+LOGGER.info("Data table is immutable, waiting for "
++ (GLOBAL_INDEX_CHECKER_
svn commit: r35041 - in /dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0: ./ bin/ src/
Author: skadam Date: Sun Jul 28 22:23:48 2019 New Revision: 35041 Log: RC for 4.14.3-HBase-1.3 Added: dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/ dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/ dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz (with props) dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.asc dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha256 dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha512 dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/src/ dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz (with props) dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.asc dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.sha256 dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.sha512 Added: dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.asc == --- dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.asc (added) +++ dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.asc Sun Jul 28 22:23:48 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEU7Kwsh8ErH62QWeCSLeAfZXxJ7UFAl0+FpoACgkQSLeAfZXx +J7Xqxg//ap5ApntQa8oXlANzkQjVjkxDL0ze6yzn+/09jI3J/N4cKQYa/kxTONre +4FxTL3J1ZoKKLReyQykjkXZc2mj6EzJ5JuokhtWAdXrjaQHNjqRmHWhfNz82yrTl +TLgXFcXfHj5BMfdF9DJgq9mTf5HZEnce8SU/+sk/qAf/5OrmRM1gWSFrpNFwtNFj +RSQOn0myWfcsXRjzrYCEZVJmBxb6ox1ZGEqz5py07XHQ2NnuLpHAdetgJy2PuqGi +dX8P5XiPnvnesZBGk+OdNPwufnoYgzBnPALDfUm8Q+hUafjJwmpoa/X1GbbYAU9p +jTN25WYR2FptNCnVK8i1/Lo/xS+8sGBBgYAnHSVRa+DmQSxMMv4jiHU4EKZQ+bU3 +qL+pq+rBb7XwfraJiQZhKUv81ytBCPXPokgx1KuD3RuwJxZFAaW/yw+UqpQjBPLA +5lneUzofCoxByFtsU3Hw8guEp3Yz7CnEQg+YD065wLVLuwwPDiswAzH3csxdC/eb +beM4mLR8AFyNU1JzU6EvCRBqO2N+eaEjfWYrkLPGC3FIvDAbufhFS2LVeU/+JtnJ +Pci2MOQGiEF+0KJEsorkJYSLSY1n4dOp/qEgbIgpeAQfZLRL04RSktxgO7cqMuqG +ra7EixHVSB+Og0VakWwInk9XbGlsVn/tqcPS+PaWpm8D5ahjmoA= +=cFBF +-END PGP SIGNATURE- Added: dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha256 == --- dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha256 (added) +++ dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha256 Sun Jul 28 22:23:48 2019 @@ -0,0 +1 @@ +SHA256(apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz)= c230f29376db10b051d5bb7700080568f1be4ca1707e387078f348c0f3922bbb Added: dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha512 == --- dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha512 (added) +++ dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha512 Sun Jul 28 22:23:48 2019 @@ -0,0 +1 @@ +SHA512(apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz)= f687a05523b28c636240641857a8222ea560173f753d04d56c373dcd86c6f1bd09c1b2cc00460b665b0a5331559367c4667f106e3f872275971656b3ad61c410 Added: dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.asc == --- dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.asc (added) +++ dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.asc Sun Jul 28 22:23:48 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEU7Kwsh8ErH62QWeCSLeAfZXxJ7UFAl0+FqcACgkQSLeAfZXx +J7WN2g//f6gSzYBmZpTfHjA+CbhNsNRGGL9QjViTjnZl2VWvOB1OhJ2OCnfdcGBH +R2ZRoAdswbGrGfAfDjTh
[phoenix] annotated tag 4.14.3-HBase-1.3-rc0 updated (bfaa27e -> acd2ac2)
This is an automated email from the ASF dual-hosted git repository. skadam pushed a change to annotated tag 4.14.3-HBase-1.3-rc0 in repository https://gitbox.apache.org/repos/asf/phoenix.git. *** WARNING: tag 4.14.3-HBase-1.3-rc0 was modified! *** from bfaa27e (commit) to acd2ac2 (tag) tagging bfaa27edbc4029b5240d50689511d8b62457526e (commit) replaces v4.14.2-HBase-1.3 by s.kadam on Sun Jul 28 14:47:58 2019 -0700 - Log - 4.14.3-HBase-1.3-rc0 --- No new revisions were added by this update. Summary of changes:
svn commit: r35042 - in /dev/phoenix: apache-phoenix-4.14.3-HBase-1.3-rc0/ phoenix-4.14.3-HBase-1.3-rc0/
Author: skadam Date: Sun Jul 28 22:25:43 2019 New Revision: 35042 Log: RC for 4.14.3-HBase-1.3 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc0/ - copied from r35041, dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/ Removed: dev/phoenix/phoenix-4.14.3-HBase-1.3-rc0/
[phoenix] branch 4.14-HBase-1.4 updated: PHOENIX-5415: NPE in getting conf from addHbaseResources in IndexUpgradeTool
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.4 by this push:
new dee8051 PHOENIX-5415: NPE in getting conf from addHbaseResources in
IndexUpgradeTool
dee8051 is described below
commit dee8051bcbe31b327bdb20a38a3d6df96f65af99
Author: s.kadam
AuthorDate: Fri Jul 26 15:10:34 2019 -0700
PHOENIX-5415: NPE in getting conf from addHbaseResources in IndexUpgradeTool
---
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 148 +
1 file changed, 93 insertions(+), 55 deletions(-)
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 7855c40..10d9caf 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
@@ -18,6 +18,7 @@
package org.apache.phoenix.mapreduce.index;
import com.google.common.annotations.VisibleForTesting;
+import com.google.gson.Gson;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
@@ -32,6 +33,8 @@ import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.util.Tool;
+import org.apache.hadoop.util.ToolRunner;
import org.apache.phoenix.hbase.index.IndexRegionObserver;
import org.apache.phoenix.hbase.index.Indexer;
import org.apache.phoenix.hbase.index.covered.NonTxIndexBuilder;
@@ -55,6 +58,7 @@ import java.util.HashSet;
import java.util.logging.Logger;
import org.apache.hadoop.conf.Configuration;
import org.apache.phoenix.util.SchemaUtil;
+import org.apache.phoenix.util.StringUtil;
import java.io.IOException;
import java.nio.file.Files;
@@ -70,7 +74,7 @@ import java.util.logging.SimpleFormatter;
import static org.apache.phoenix.query.QueryServicesOptions
.GLOBAL_INDEX_CHECKER_ENABLED_MAP_EXPIRATION_MIN;
-public class IndexUpgradeTool extends Configured {
+public class IndexUpgradeTool extends Configured implements Tool {
private static final Logger LOGGER =
Logger.getLogger(IndexUpgradeTool.class.getName());
@@ -145,21 +149,6 @@ public class IndexUpgradeTool extends Configured {
return operation;
}
-public static void main (String[] args) {
-CommandLine cmdLine = null;
-
-IndexUpgradeTool iut = new IndexUpgradeTool();
-try {
-cmdLine = iut.parseOptions(args);
-LOGGER.info("Index Upgrade tool initiated: "+ StringUtils.join(
args, ","));
-} catch (IllegalStateException e) {
-iut.printHelpAndExit(e.getMessage(), iut.getOptions());
-}
-iut.initializeTool(cmdLine);
-iut.prepareToolSetup();
-iut.executeTool();
-}
-
public IndexUpgradeTool(String mode, String tables, String inputFile,
String outputFile, boolean dryRun, IndexTool indexTool) {
this.operation = mode;
@@ -172,6 +161,21 @@ public class IndexUpgradeTool extends Configured {
public IndexUpgradeTool () { }
+@Override
+public int run(String[] args) throws Exception {
+CommandLine cmdLine = null;
+try {
+cmdLine = parseOptions(args);
+LOGGER.info("Index Upgrade tool initiated: " + StringUtils.join(
args, ","));
+} catch (IllegalStateException e) {
+printHelpAndExit(e.getMessage(), getOptions());
+}
+initializeTool(cmdLine);
+prepareToolSetup();
+executeTool();
+return 0;
+}
+
/**
* Parses the commandline arguments, throws IllegalStateException if
mandatory arguments are
* missing.
@@ -324,12 +328,12 @@ public class IndexUpgradeTool extends Configured {
try (Admin admin = queryServices.getAdmin()) {
PTable dataTable = PhoenixRuntime.getTableNoCache(conn,
dataTableFullName);
-LOGGER.fine("Executing " + operation + " for " +
dataTableFullName);
+LOGGER.info("Executing " + operation + " for " +
dataTableFullName);
boolean mutable = !(dataTable.isImmutableRows());
if (!mutable) {
-LOGGER.fine("Data table is immutable, waiting for "
-+ GLOBAL_INDEX_CHECKER_ENABLED_MAP_EXPIRATION_MIN
+ 1
+LOGGER.info("Data table is immutable, waiting for "
++ (GLOBAL_INDEX_CHECKER_ENABLED_MAP_EXPIRATION_MIN
+ 1)
[phoenix] branch 4.14-HBase-1.3 updated: PHOENIX-5275: Remove accidental imports from curator-client-2.12.0
This is an automated email from the ASF dual-hosted git repository. skadam pushed a commit to branch 4.14-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/4.14-HBase-1.3 by this push: new c4dda57 PHOENIX-5275: Remove accidental imports from curator-client-2.12.0 c4dda57 is described below commit c4dda5789102cb0a2904d8f3836723f6289a4115 Author: William Shen AuthorDate: Mon Jul 29 18:18:09 2019 -0700 PHOENIX-5275: Remove accidental imports from curator-client-2.12.0 Signed-off-by: s.kadam --- phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java | 2 +- .../src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java| 2 +- .../src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java index 48a49b2..d2e0f88 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java @@ -46,7 +46,7 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.curator.shaded.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTableInterface; diff --git a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java index 56d9933..6e1fe4e 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java @@ -49,7 +49,7 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; -import org.apache.curator.shaded.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java index e279074..7c3640c 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java @@ -20,7 +20,7 @@ package org.apache.phoenix.query; import static org.apache.phoenix.query.QueryServicesOptions.DEFAULT_SPOOL_DIRECTORY; import static org.apache.phoenix.query.QueryServicesOptions.withDefaults; -import org.apache.curator.shaded.com.google.common.io.Files; +import com.google.common.io.Files; import org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.ReadOnlyProps;
[phoenix] 02/02: PHOENIX-5418 : Set ScenarioName for ResultTest
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit b560707f4b7897d38ef4359b85c0211435ab2a46
Author: Viraj Jasani
AuthorDate: Sat Aug 3 12:20:55 2019 +0530
PHOENIX-5418 : Set ScenarioName for ResultTest
Signed-off-by: s.kadam
---
phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java
index 2afdd21..28e8c62 100644
--- a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java
+++ b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java
@@ -163,9 +163,7 @@ public class ResultTest extends ResultBaseTest {
dataModelResult.setZookeeper("mytestzk");
ScenarioResult scenarioResult = new ScenarioResult();
scenarioResult.setTableName("MY_TABLE_NAME");
-
-// Scenario Name left blank on purpose to test that null values get
generated correctly.
-//scenarioResult.setName("MY_TEST_SCENARIO");
+scenarioResult.setName("MY_TEST_SCENARIO");
dataModelResult.getScenarioResult().add(scenarioResult);
scenarioResult.setRowCount(999);
[phoenix] branch 4.14-HBase-1.3 updated (c4dda57 -> b560707)
This is an automated email from the ASF dual-hosted git repository. skadam pushed a change to branch 4.14-HBase-1.3 in repository https://gitbox.apache.org/repos/asf/phoenix.git. from c4dda57 PHOENIX-5275: Remove accidental imports from curator-client-2.12.0 new f7f7873 PHOENIX-5327 : PherfMainIT fixes new b560707 PHOENIX-5418 : Set ScenarioName for ResultTest 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: .../org/apache/phoenix/pherf/DataIngestIT.java | 6 +-- .../java/org/apache/phoenix/pherf/PherfMainIT.java | 1 + .../main/java/org/apache/phoenix/pherf/Pherf.java | 1 - .../phoenix/pherf/workload/QueryExecutor.java | 16 +-- .../apache/phoenix/pherf/workload/Workload.java| 13 +++--- .../phoenix/pherf/workload/WriteWorkload.java | 8 ++-- .../scenario/prod_test_unsalted_scenario.xml | 50 ++ .../java/org/apache/phoenix/pherf/ResultTest.java | 4 +- 8 files changed, 60 insertions(+), 39 deletions(-)
[phoenix] 01/02: PHOENIX-5327 : PherfMainIT fixes
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit f7f7873733cd61c911fd79569dfa69a8c95b9078
Author: Viraj Jasani
AuthorDate: Thu Aug 1 14:47:18 2019 +0530
PHOENIX-5327 : PherfMainIT fixes
Signed-off-by: s.kadam
---
.../org/apache/phoenix/pherf/DataIngestIT.java | 6 +--
.../java/org/apache/phoenix/pherf/PherfMainIT.java | 1 +
.../main/java/org/apache/phoenix/pherf/Pherf.java | 1 -
.../phoenix/pherf/workload/QueryExecutor.java | 16 +--
.../apache/phoenix/pherf/workload/Workload.java| 13 +++---
.../phoenix/pherf/workload/WriteWorkload.java | 8 ++--
.../scenario/prod_test_unsalted_scenario.xml | 50 ++
7 files changed, 59 insertions(+), 36 deletions(-)
diff --git
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 973ce2c..bc768e2 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -44,7 +44,6 @@ import org.apache.phoenix.pherf.workload.Workload;
import org.apache.phoenix.pherf.workload.WorkloadExecutor;
import org.apache.phoenix.pherf.workload.WriteWorkload;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import com.jcabi.jdbc.JdbcSession;
@@ -217,8 +216,7 @@ public class DataIngestIT extends ResultBaseTestIT {
assertExpectedNumberOfRecordsWritten(scenario);
}
-private void assertExpectedNumberOfRecordsWritten(Scenario scenario)
throws Exception,
-SQLException {
+private void assertExpectedNumberOfRecordsWritten(Scenario scenario)
throws Exception {
Connection connection = util.getConnection(scenario.getTenantId());
String sql = "select count(*) from " + scenario.getTableName();
Integer count = new JdbcSession(connection).sql(sql).select(new
Outcome() {
@@ -230,7 +228,7 @@ public class DataIngestIT extends ResultBaseTestIT {
return null;
}
});
-assertNotNull("Could not retrieve count. " + count);
+assertNotNull("Could not retrieve count. ", count);
assertEquals("Expected 100 rows to have been inserted",
scenario.getRowCount(), count.intValue());
}
diff --git
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
index 6dc900e..3ee9327 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
@@ -25,6 +25,7 @@ import org.junit.contrib.java.lang.system.ExpectedSystemExit;
import java.util.concurrent.Future;
public class PherfMainIT extends ResultBaseTestIT {
+
@Rule
public final ExpectedSystemExit exit = ExpectedSystemExit.none();
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index 2b55e29..77939b4 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Properties;
import com.google.common.annotations.VisibleForTesting;
-import jline.internal.TestAccessible;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
diff --git
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/QueryExecutor.java
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/QueryExecutor.java
index d894a96..c15cf1a 100644
---
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/QueryExecutor.java
+++
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/QueryExecutor.java
@@ -20,9 +20,18 @@ package org.apache.phoenix.pherf.workload;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
-import org.apache.phoenix.pherf.configuration.*;
-import org.apache.phoenix.pherf.result.*;
+import org.apache.phoenix.pherf.configuration.DataModel;
+import org.apache.phoenix.pherf.configuration.ExecutionType;
+import org.apache.phoenix.pherf.configuration.Query;
+import org.apache.phoenix.pherf.configuration.QuerySet;
+import org.apache.phoenix.pherf.configuration.Scenario;
+import org.apache.phoenix.pherf.configuration.XMLConfigParser;
+import org.apache.phoenix.pherf.result.DataModelResult;
+import org.apache.phoenix.pherf.result.QueryResult;
+import org.apache.phoenix.pherf.result.QuerySetResult;
+import org.apache.pho
[phoenix] 01/03: PHOENIX-5275: Remove accidental imports from curator-client-2.12.0
This is an automated email from the ASF dual-hosted git repository. skadam pushed a commit to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git commit edc9e680ae46ac6fb094cd4720eed48beb59206d Author: William Shen AuthorDate: Mon Jul 29 18:18:09 2019 -0700 PHOENIX-5275: Remove accidental imports from curator-client-2.12.0 Signed-off-by: s.kadam --- phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java | 2 +- .../src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java| 2 +- .../src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java index 48a49b2..d2e0f88 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java @@ -46,7 +46,7 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.curator.shaded.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTableInterface; diff --git a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java index 56d9933..6e1fe4e 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereOptimizerTest.java @@ -49,7 +49,7 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; -import org.apache.curator.shaded.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java index e279074..7c3640c 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java @@ -20,7 +20,7 @@ package org.apache.phoenix.query; import static org.apache.phoenix.query.QueryServicesOptions.DEFAULT_SPOOL_DIRECTORY; import static org.apache.phoenix.query.QueryServicesOptions.withDefaults; -import org.apache.curator.shaded.com.google.common.io.Files; +import com.google.common.io.Files; import org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.ReadOnlyProps;
[phoenix] 02/03: PHOENIX-5327 : PherfMainIT fixes
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 07713db03403cfb1fad12a2956ae633e18f1414b
Author: Viraj Jasani
AuthorDate: Thu Aug 1 14:47:18 2019 +0530
PHOENIX-5327 : PherfMainIT fixes
Signed-off-by: s.kadam
---
.../org/apache/phoenix/pherf/DataIngestIT.java | 6 +--
.../java/org/apache/phoenix/pherf/PherfMainIT.java | 1 +
.../main/java/org/apache/phoenix/pherf/Pherf.java | 1 -
.../phoenix/pherf/workload/QueryExecutor.java | 16 +--
.../apache/phoenix/pherf/workload/Workload.java| 13 +++---
.../phoenix/pherf/workload/WriteWorkload.java | 8 ++--
.../scenario/prod_test_unsalted_scenario.xml | 50 ++
7 files changed, 59 insertions(+), 36 deletions(-)
diff --git
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 973ce2c..bc768e2 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -44,7 +44,6 @@ import org.apache.phoenix.pherf.workload.Workload;
import org.apache.phoenix.pherf.workload.WorkloadExecutor;
import org.apache.phoenix.pherf.workload.WriteWorkload;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import com.jcabi.jdbc.JdbcSession;
@@ -217,8 +216,7 @@ public class DataIngestIT extends ResultBaseTestIT {
assertExpectedNumberOfRecordsWritten(scenario);
}
-private void assertExpectedNumberOfRecordsWritten(Scenario scenario)
throws Exception,
-SQLException {
+private void assertExpectedNumberOfRecordsWritten(Scenario scenario)
throws Exception {
Connection connection = util.getConnection(scenario.getTenantId());
String sql = "select count(*) from " + scenario.getTableName();
Integer count = new JdbcSession(connection).sql(sql).select(new
Outcome() {
@@ -230,7 +228,7 @@ public class DataIngestIT extends ResultBaseTestIT {
return null;
}
});
-assertNotNull("Could not retrieve count. " + count);
+assertNotNull("Could not retrieve count. ", count);
assertEquals("Expected 100 rows to have been inserted",
scenario.getRowCount(), count.intValue());
}
diff --git
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
index 6dc900e..3ee9327 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/PherfMainIT.java
@@ -25,6 +25,7 @@ import org.junit.contrib.java.lang.system.ExpectedSystemExit;
import java.util.concurrent.Future;
public class PherfMainIT extends ResultBaseTestIT {
+
@Rule
public final ExpectedSystemExit exit = ExpectedSystemExit.none();
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index 51d6743..4eff847 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Properties;
import com.google.common.annotations.VisibleForTesting;
-import jline.internal.TestAccessible;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
diff --git
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/QueryExecutor.java
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/QueryExecutor.java
index d894a96..c15cf1a 100644
---
a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/QueryExecutor.java
+++
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/workload/QueryExecutor.java
@@ -20,9 +20,18 @@ package org.apache.phoenix.pherf.workload;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.phoenix.pherf.PherfConstants.GeneratePhoenixStats;
-import org.apache.phoenix.pherf.configuration.*;
-import org.apache.phoenix.pherf.result.*;
+import org.apache.phoenix.pherf.configuration.DataModel;
+import org.apache.phoenix.pherf.configuration.ExecutionType;
+import org.apache.phoenix.pherf.configuration.Query;
+import org.apache.phoenix.pherf.configuration.QuerySet;
+import org.apache.phoenix.pherf.configuration.Scenario;
+import org.apache.phoenix.pherf.configuration.XMLConfigParser;
+import org.apache.phoenix.pherf.result.DataModelResult;
+import org.apache.phoenix.pherf.result.QueryResult;
+import org.apache.phoenix.pherf.result.QuerySetResult;
+import org.apache.pho
[phoenix] branch 4.14-HBase-1.4 updated (dee8051 -> cd83adb)
This is an automated email from the ASF dual-hosted git repository. skadam pushed a change to branch 4.14-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git. from dee8051 PHOENIX-5415: NPE in getting conf from addHbaseResources in IndexUpgradeTool new edc9e68 PHOENIX-5275: Remove accidental imports from curator-client-2.12.0 new 07713db PHOENIX-5327 : PherfMainIT fixes new cd83adb PHOENIX-5418 : Set ScenarioName for ResultTest 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: .../java/org/apache/phoenix/end2end/UpgradeIT.java | 2 +- .../apache/phoenix/compile/WhereOptimizerTest.java | 2 +- .../phoenix/query/QueryServicesTestImpl.java | 2 +- .../org/apache/phoenix/pherf/DataIngestIT.java | 6 +-- .../java/org/apache/phoenix/pherf/PherfMainIT.java | 1 + .../main/java/org/apache/phoenix/pherf/Pherf.java | 1 - .../phoenix/pherf/workload/QueryExecutor.java | 16 +-- .../apache/phoenix/pherf/workload/Workload.java| 13 +++--- .../phoenix/pherf/workload/WriteWorkload.java | 8 ++-- .../scenario/prod_test_unsalted_scenario.xml | 50 ++ .../java/org/apache/phoenix/pherf/ResultTest.java | 4 +- 11 files changed, 63 insertions(+), 42 deletions(-)
[phoenix] 03/03: PHOENIX-5418 : Set ScenarioName for ResultTest
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit cd83adbcc3b7a93961118d39b6645fa8bae1efcf
Author: Viraj Jasani
AuthorDate: Sat Aug 3 12:20:55 2019 +0530
PHOENIX-5418 : Set ScenarioName for ResultTest
Signed-off-by: s.kadam
---
phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java
index 2afdd21..28e8c62 100644
--- a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java
+++ b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java
@@ -163,9 +163,7 @@ public class ResultTest extends ResultBaseTest {
dataModelResult.setZookeeper("mytestzk");
ScenarioResult scenarioResult = new ScenarioResult();
scenarioResult.setTableName("MY_TABLE_NAME");
-
-// Scenario Name left blank on purpose to test that null values get
generated correctly.
-//scenarioResult.setName("MY_TEST_SCENARIO");
+scenarioResult.setName("MY_TEST_SCENARIO");
dataModelResult.getScenarioResult().add(scenarioResult);
scenarioResult.setRowCount(999);
svn commit: r35143 - in /dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1: ./ bin/ src/
Author: skadam Date: Tue Aug 6 19:08:49 2019 New Revision: 35143 Log: Adding 4.14.3-HBase-1.4-rc1 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz (with props) dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.asc dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha256 dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha512 dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/src/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz (with props) dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.asc dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.sha256 dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.sha512 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.asc == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.asc (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.asc Tue Aug 6 19:08:49 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEU7Kwsh8ErH62QWeCSLeAfZXxJ7UFAl1JzvwACgkQSLeAfZXx +J7WlLxAAj7kowNKrgxPlRXt/RaFG9YtfbkZgWXiLcu+QcEoq37SRWGBfFxidsuV1 +QCRfBXVE+/kWYHVY1zS/YP2mbCKG+Rd+gW7MhDTFkZlPX6ytlHHv+BZHdGvTIUXm +/2H+ibOBTZqg15fWQ3SmlWAH0i54YQcef1miOZa0pz0g9VucRrXM+eVsR1w9iqGr +0cFu8P7ggNvUv1AzhRLgjDLeYQkzOI/DNS8yejCs6HIP9YSf9dsgAJf+THZTvFAy +9G0Zr2U39+4xbdsGflcvP6O0/iuOxggkSFQUiSeylw9pabqf3MbmEq38L4jIt3LC +qFJslgdQMUTCFV6b/MXTbQClDklWrPtkb4nm2oiT/sFW26ArhnPWGMSHwjipEDsx +h10Ju4kf8rwiv5/9Rq1fnrTtTGdaLi0u5+2kHpR/LaDVp2ExalilHE2vJ3OUD00y +v80+drFPKa01h8cPPHfO4ZF1CBkTtD+3cE1mA7lWsU0ggJCAk8aEmUOIHNjWk/qu +5r39kGqlJ4HfsXLjg19frzszF9hpA2+XJzmCVvQKvogt9O3iaf4WWW4oL2zHJ2Tb +nMqYT+dSOKoiK9QjOX21vexA4qJdiUiKAsAD4qJGNCoi5ho5aFejHvoYLg9OMQ89 +3AqzPyBoB1Bdi5jmp4/UzimvLdi+SbH9uQPQmznC7UGwVBLTr8Q= +=NN4G +-END PGP SIGNATURE- Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha256 == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha256 (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha256 Tue Aug 6 19:08:49 2019 @@ -0,0 +1 @@ +SHA256(apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz)= 573e8af4046afa3e2e27714ae273742c7ad79f05b5341eb26c9d53901c260402 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha512 == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha512 (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/bin/apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz.sha512 Tue Aug 6 19:08:49 2019 @@ -0,0 +1 @@ +SHA512(apache-phoenix-4.14.3-HBase-1.4-bin.tar.gz)= 14b223c2e2084a987f893f1e9a9cfc0430a804ef22f52d577185e0a1d13348ebc9dc7b3967db6531a437624bea8d41c376fb2669fd710c7b55128344a65f6b29 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.asc == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.asc (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.4-rc1/src/apache-phoenix-4.14.3-HBase-1.4-src.tar.gz.asc Tue Aug 6 19:08:49 2019 @@ -0,0 +1,16
svn commit: r35142 - in /dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1: ./ bin/ src/
Author: skadam Date: Tue Aug 6 18:54:45 2019 New Revision: 35142 Log: Adding 4.14.3-HBase-1.3-rc1 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz (with props) dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.asc dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha256 dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha512 dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/src/ dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz (with props) dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.asc dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.sha256 dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.sha512 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.asc == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.asc (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.asc Tue Aug 6 18:54:45 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEU7Kwsh8ErH62QWeCSLeAfZXxJ7UFAl1JymMACgkQSLeAfZXx +J7WDog/+NQS3S7McL1vMuy5Js/M1QRar6kK/YTu3Zaw3lot9rGm9emI+GaT0hqw6 +Ek6cpZkYyCemZhWSgEii1zKbJz7DmeblA+X2R1XxsF+mmeyr4yqCxtf3qeaonFhr +EVK73x1CyHrkc+RHFWZZqxKiLbiBCx6TwbKf7m+bJzbC9z5cBfz4yDJDgKDkwzJ7 +8fmXl3jyzpOCr6djz0IK8xhAOgWCIAWz3nOKlZX+6q/r1MZ0o+9Tw+qiaCBjrgcT +YAnuODZt/Bf6dhR4Bg7kvHhSkE7C2Gj8awDpTx9iLELWBgGwdkVbOPvOUbSXpaTI +xwgTcPRc5nSlSPhviBi0ezM+jZ2SwWpK0rgJntoKcBS3eyJqKwYAHxn5lbGY7FTc +BBS79Xu5N6QCfSmcwDBbVnG0kCleukuedrT2m59LBm68kIXP/S+4r0tTMZtFKsVt +E+b1LVnRW39f6rMqDZiml+Xo7mNN6yBlXdwL4rR7m61NbQAX+VOA4UOxDBotwP93 +QDv8rt9JIC7SlfvhRNZEpvguNjV7Lz3rhcLzljIhONrNfKZtLkreDpHALHd0F87l +USxGcgegPoAWKHIQ010Hbs/09a1ExyLDZdOu/p/LFUNdfAoQ5EE/GZkzNY/AA8xf +5tfhXW76+STmwudl3VErhIKn4LCdhEQ+tOapy2/7zAI8SDl49EE= +=kPvE +-END PGP SIGNATURE- Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha256 == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha256 (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha256 Tue Aug 6 18:54:45 2019 @@ -0,0 +1 @@ +SHA256(apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz)= 0a9e57f9fcf435c37a608e2118ca0e4edefdb13f8d9f86665cd91a49e6e7ef85 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha512 == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha512 (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/bin/apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz.sha512 Tue Aug 6 18:54:45 2019 @@ -0,0 +1 @@ +SHA512(apache-phoenix-4.14.3-HBase-1.3-bin.tar.gz)= 7b3f04d7189574da2baa9eee98c4f09e1e23c22e7450ddf3326ba54c73502a76305311002efc47bf302a981d1227e000155da8dc8a171b2d2b943816094fb3a6 Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.asc == --- dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.asc (added) +++ dev/phoenix/apache-phoenix-4.14.3-HBase-1.3-rc1/src/apache-phoenix-4.14.3-HBase-1.3-src.tar.gz.asc Tue Aug 6 18:54:45 2019 @@ -0,0 +1,16
[phoenix] annotated tag 4.14.3-HBase-1.3-rc1 updated (5e32835 -> abc2c6a)
This is an automated email from the ASF dual-hosted git repository. skadam pushed a change to annotated tag 4.14.3-HBase-1.3-rc1 in repository https://gitbox.apache.org/repos/asf/phoenix.git. *** WARNING: tag 4.14.3-HBase-1.3-rc1 was modified! *** from 5e32835 (commit) to abc2c6a (tag) tagging 5e32835eab87827c8aa70d587bfb3d65b64a3d14 (commit) replaces v4.14.2-HBase-1.3 by s.kadam on Tue Aug 6 11:50:04 2019 -0700 - Log - 4.14.3-HBase-1.3-rc1 --- No new revisions were added by this update. Summary of changes:
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5395: IndexUpgradeTool passes data table instead of view for post upgrade view index rebuild
This is an automated email from the ASF dual-hosted git repository.
skadam 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 f1b2bce PHOENIX-5395: IndexUpgradeTool passes data table instead of
view for post upgrade view index rebuild
f1b2bce is described below
commit f1b2bce9dc2a82b7cc7dcdff0541a3f96d421054
Author: s.kadam
AuthorDate: Mon Jul 22 12:00:59 2019 -0700
PHOENIX-5395: IndexUpgradeTool passes data table instead of view for post
upgrade view index rebuild
---
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 198 +++--
1 file changed, 141 insertions(+), 57 deletions(-)
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 53be19e..9a76b9b 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
@@ -92,7 +92,8 @@ public class IndexUpgradeTool extends Configured {
"Log file path where the logs are written");
private static final Option INDEX_SYNC_REBUILD_OPTION = new
Option("sr","index-sync-rebuild",
false,
-"[Optional]Whether or not synchronously rebuild the indexes;
default rebuild asynchronous");
+"[Optional]Whether or not synchronously rebuild the indexes; "
++ "default rebuild asynchronous");
public static final String UPGRADE_OP = "upgrade";
public static final String ROLLBACK_OP = "rollback";
@@ -100,7 +101,7 @@ public class IndexUpgradeTool extends Configured {
private IndexTool indexingTool;
private HashMap> tablesAndIndexes = new
HashMap<>();
-private HashMap> rebuildMap = new
HashMap<>();
+private HashMap> rebuildMap = new
HashMap<>();
private HashMap prop = new HashMap<>();
private boolean dryRun, upgrade, syncRebuild;
@@ -128,7 +129,6 @@ public class IndexUpgradeTool extends Configured {
}
public void setTest(boolean test) { this.test = test; }
-
public boolean getDryRun() {
return this.dryRun;
}
@@ -339,13 +339,7 @@ public class IndexUpgradeTool extends Configured {
disableTable(admin, dataTableFullName, indexes);
modifyTable(admin, dataTableFullName, indexes);
enableTable(admin, dataTableFullName, indexes);
-if (upgrade) {
-if(!test) {
-indexingTool = new IndexTool();
-}
-indexingTool.setConf(conf);
-rebuildIndexes(dataTableFullName, indexingTool);
-}
+rebuildIndexes(conn, conf, dataTableFullName);
} catch (IOException | SQLException | InterruptedException e) {
LOGGER.severe("Something went wrong while executing "
+ operation + " steps " + e);
@@ -355,17 +349,6 @@ public class IndexUpgradeTool extends Configured {
return 0;
}
-private void modifyTable(Admin admin, String dataTableFullName,
HashSet indexes)
-throws IOException {
-if (upgrade) {
-modifyIndexTable(admin, indexes);
-modifyDataTable(admin, dataTableFullName);
-} else {
-modifyDataTable(admin, dataTableFullName);
-modifyIndexTable(admin, indexes);
-}
-}
-
private void disableTable(Admin admin, String dataTable,
HashSetindexes)
throws IOException {
if (admin.isTableEnabled(TableName.valueOf(dataTable))) {
@@ -388,6 +371,17 @@ public class IndexUpgradeTool extends Configured {
}
}
+private void modifyTable(Admin admin, String dataTableFullName,
HashSet indexes)
+throws IOException {
+if (upgrade) {
+modifyIndexTable(admin, indexes);
+modifyDataTable(admin, dataTableFullName);
+} else {
+modifyDataTable(admin, dataTableFullName);
+modifyIndexTable(admin, indexes);
+}
+}
+
private void enableTable(Admin admin, String dataTable,
HashSetindexes)
throws IOException {
if (!admin.isTableEnabled(TableName.valueOf(dataTable))) {
@@ -410,6 +404,17 @@ public class IndexUpgradeTool extends Configured {
}
}
+private void rebuildIndexes(Connection conn, Configuration conf, String
dataTableFullName) {
+if (upgrade) {
+prepareToRebuildIndexes(conn, dataTableFullName);
+if(!test) {
+indexingTool = new IndexTool();
+}
+
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5395: IndexUpgradeTool passes data table instead of view for post upgrade view index rebuild
This is an automated email from the ASF dual-hosted git repository.
skadam 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 86e4382 PHOENIX-5395: IndexUpgradeTool passes data table instead of
view for post upgrade view index rebuild
86e4382 is described below
commit 86e4382d6a7d7026929915efceb2296b1e97b73d
Author: s.kadam
AuthorDate: Mon Jul 22 12:00:59 2019 -0700
PHOENIX-5395: IndexUpgradeTool passes data table instead of view for post
upgrade view index rebuild
---
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 198 +++--
1 file changed, 141 insertions(+), 57 deletions(-)
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 53be19e..9a76b9b 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
@@ -92,7 +92,8 @@ public class IndexUpgradeTool extends Configured {
"Log file path where the logs are written");
private static final Option INDEX_SYNC_REBUILD_OPTION = new
Option("sr","index-sync-rebuild",
false,
-"[Optional]Whether or not synchronously rebuild the indexes;
default rebuild asynchronous");
+"[Optional]Whether or not synchronously rebuild the indexes; "
++ "default rebuild asynchronous");
public static final String UPGRADE_OP = "upgrade";
public static final String ROLLBACK_OP = "rollback";
@@ -100,7 +101,7 @@ public class IndexUpgradeTool extends Configured {
private IndexTool indexingTool;
private HashMap> tablesAndIndexes = new
HashMap<>();
-private HashMap> rebuildMap = new
HashMap<>();
+private HashMap> rebuildMap = new
HashMap<>();
private HashMap prop = new HashMap<>();
private boolean dryRun, upgrade, syncRebuild;
@@ -128,7 +129,6 @@ public class IndexUpgradeTool extends Configured {
}
public void setTest(boolean test) { this.test = test; }
-
public boolean getDryRun() {
return this.dryRun;
}
@@ -339,13 +339,7 @@ public class IndexUpgradeTool extends Configured {
disableTable(admin, dataTableFullName, indexes);
modifyTable(admin, dataTableFullName, indexes);
enableTable(admin, dataTableFullName, indexes);
-if (upgrade) {
-if(!test) {
-indexingTool = new IndexTool();
-}
-indexingTool.setConf(conf);
-rebuildIndexes(dataTableFullName, indexingTool);
-}
+rebuildIndexes(conn, conf, dataTableFullName);
} catch (IOException | SQLException | InterruptedException e) {
LOGGER.severe("Something went wrong while executing "
+ operation + " steps " + e);
@@ -355,17 +349,6 @@ public class IndexUpgradeTool extends Configured {
return 0;
}
-private void modifyTable(Admin admin, String dataTableFullName,
HashSet indexes)
-throws IOException {
-if (upgrade) {
-modifyIndexTable(admin, indexes);
-modifyDataTable(admin, dataTableFullName);
-} else {
-modifyDataTable(admin, dataTableFullName);
-modifyIndexTable(admin, indexes);
-}
-}
-
private void disableTable(Admin admin, String dataTable,
HashSetindexes)
throws IOException {
if (admin.isTableEnabled(TableName.valueOf(dataTable))) {
@@ -388,6 +371,17 @@ public class IndexUpgradeTool extends Configured {
}
}
+private void modifyTable(Admin admin, String dataTableFullName,
HashSet indexes)
+throws IOException {
+if (upgrade) {
+modifyIndexTable(admin, indexes);
+modifyDataTable(admin, dataTableFullName);
+} else {
+modifyDataTable(admin, dataTableFullName);
+modifyIndexTable(admin, indexes);
+}
+}
+
private void enableTable(Admin admin, String dataTable,
HashSetindexes)
throws IOException {
if (!admin.isTableEnabled(TableName.valueOf(dataTable))) {
@@ -410,6 +404,17 @@ public class IndexUpgradeTool extends Configured {
}
}
+private void rebuildIndexes(Connection conn, Configuration conf, String
dataTableFullName) {
+if (upgrade) {
+prepareToRebuildIndexes(conn, dataTableFullName);
+if(!test) {
+indexingTool = new IndexTool();
+}
+
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5395: IndexUpgradeTool passes data table instead of view for post upgrade view index rebuild
This is an automated email from the ASF dual-hosted git repository.
skadam 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 1d6584c PHOENIX-5395: IndexUpgradeTool passes data table instead of
view for post upgrade view index rebuild
1d6584c is described below
commit 1d6584c136582f08282f18c93caa1716c95332f7
Author: s.kadam
AuthorDate: Mon Jul 22 12:00:59 2019 -0700
PHOENIX-5395: IndexUpgradeTool passes data table instead of view for post
upgrade view index rebuild
---
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 198 +++--
1 file changed, 141 insertions(+), 57 deletions(-)
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 53be19e..9a76b9b 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
@@ -92,7 +92,8 @@ public class IndexUpgradeTool extends Configured {
"Log file path where the logs are written");
private static final Option INDEX_SYNC_REBUILD_OPTION = new
Option("sr","index-sync-rebuild",
false,
-"[Optional]Whether or not synchronously rebuild the indexes;
default rebuild asynchronous");
+"[Optional]Whether or not synchronously rebuild the indexes; "
++ "default rebuild asynchronous");
public static final String UPGRADE_OP = "upgrade";
public static final String ROLLBACK_OP = "rollback";
@@ -100,7 +101,7 @@ public class IndexUpgradeTool extends Configured {
private IndexTool indexingTool;
private HashMap> tablesAndIndexes = new
HashMap<>();
-private HashMap> rebuildMap = new
HashMap<>();
+private HashMap> rebuildMap = new
HashMap<>();
private HashMap prop = new HashMap<>();
private boolean dryRun, upgrade, syncRebuild;
@@ -128,7 +129,6 @@ public class IndexUpgradeTool extends Configured {
}
public void setTest(boolean test) { this.test = test; }
-
public boolean getDryRun() {
return this.dryRun;
}
@@ -339,13 +339,7 @@ public class IndexUpgradeTool extends Configured {
disableTable(admin, dataTableFullName, indexes);
modifyTable(admin, dataTableFullName, indexes);
enableTable(admin, dataTableFullName, indexes);
-if (upgrade) {
-if(!test) {
-indexingTool = new IndexTool();
-}
-indexingTool.setConf(conf);
-rebuildIndexes(dataTableFullName, indexingTool);
-}
+rebuildIndexes(conn, conf, dataTableFullName);
} catch (IOException | SQLException | InterruptedException e) {
LOGGER.severe("Something went wrong while executing "
+ operation + " steps " + e);
@@ -355,17 +349,6 @@ public class IndexUpgradeTool extends Configured {
return 0;
}
-private void modifyTable(Admin admin, String dataTableFullName,
HashSet indexes)
-throws IOException {
-if (upgrade) {
-modifyIndexTable(admin, indexes);
-modifyDataTable(admin, dataTableFullName);
-} else {
-modifyDataTable(admin, dataTableFullName);
-modifyIndexTable(admin, indexes);
-}
-}
-
private void disableTable(Admin admin, String dataTable,
HashSetindexes)
throws IOException {
if (admin.isTableEnabled(TableName.valueOf(dataTable))) {
@@ -388,6 +371,17 @@ public class IndexUpgradeTool extends Configured {
}
}
+private void modifyTable(Admin admin, String dataTableFullName,
HashSet indexes)
+throws IOException {
+if (upgrade) {
+modifyIndexTable(admin, indexes);
+modifyDataTable(admin, dataTableFullName);
+} else {
+modifyDataTable(admin, dataTableFullName);
+modifyIndexTable(admin, indexes);
+}
+}
+
private void enableTable(Admin admin, String dataTable,
HashSetindexes)
throws IOException {
if (!admin.isTableEnabled(TableName.valueOf(dataTable))) {
@@ -410,6 +404,17 @@ public class IndexUpgradeTool extends Configured {
}
}
+private void rebuildIndexes(Connection conn, Configuration conf, String
dataTableFullName) {
+if (upgrade) {
+prepareToRebuildIndexes(conn, dataTableFullName);
+if(!test) {
+indexingTool = new IndexTool();
+}
+
[phoenix] branch 4.14-HBase-1.3 updated: PHOENIX-5395: IndexUpgradeTool passes data table instead of view for post upgrade view index rebuild
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.3 by this push:
new efe6cc1 PHOENIX-5395: IndexUpgradeTool passes data table instead of
view for post upgrade view index rebuild
efe6cc1 is described below
commit efe6cc188e94ffc9ee9ecec7d4eaf0b9f6853264
Author: s.kadam
AuthorDate: Mon Jul 22 15:45:24 2019 -0700
PHOENIX-5395: IndexUpgradeTool passes data table instead of view for post
upgrade view index rebuild
---
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 198 +++--
1 file changed, 141 insertions(+), 57 deletions(-)
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 0da4153..7855c40 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
@@ -92,7 +92,8 @@ public class IndexUpgradeTool extends Configured {
"Log file path where the logs are written");
private static final Option INDEX_SYNC_REBUILD_OPTION = new Option("sr",
"index-sync-rebuild",
false,
-"[Optional]Whether or not synchronously rebuild the indexes;
default rebuild asynchronous");
+"[Optional]Whether or not synchronously rebuild the indexes; "
++ "default rebuild asynchronous");
public static final String UPGRADE_OP = "upgrade";
public static final String ROLLBACK_OP = "rollback";
@@ -100,7 +101,7 @@ public class IndexUpgradeTool extends Configured {
private IndexTool indexingTool;
private HashMap> tablesAndIndexes = new
HashMap<>();
-private HashMap> rebuildMap = new
HashMap<>();
+private HashMap> rebuildMap = new
HashMap<>();
private HashMap prop = new HashMap<>();
private boolean dryRun, upgrade, syncRebuild;
@@ -128,7 +129,6 @@ public class IndexUpgradeTool extends Configured {
}
public void setTest(boolean test) { this.test = test; }
-
public boolean getDryRun() {
return this.dryRun;
}
@@ -339,13 +339,7 @@ public class IndexUpgradeTool extends Configured {
disableTable(admin, dataTableFullName, indexes);
modifyTable(admin, dataTableFullName, indexes);
enableTable(admin, dataTableFullName, indexes);
-if (upgrade) {
-if(!test) {
-indexingTool = new IndexTool();
-}
-indexingTool.setConf(conf);
-rebuildIndexes(dataTableFullName, indexingTool);
-}
+rebuildIndexes(conn, conf, dataTableFullName);
} catch (IOException | SQLException | InterruptedException e) {
LOGGER.severe("Something went wrong while executing " +
operation + " steps " + e);
return -1;
@@ -354,17 +348,6 @@ public class IndexUpgradeTool extends Configured {
return 0;
}
-private void modifyTable(Admin admin, String dataTableFullName,
HashSet indexes)
-throws IOException {
-if (upgrade) {
-modifyIndexTable(admin, indexes);
-modifyDataTable(admin, dataTableFullName);
-} else {
-modifyDataTable(admin, dataTableFullName);
-modifyIndexTable(admin, indexes);
-}
-}
-
private void disableTable(Admin admin, String dataTable,
HashSetindexes)
throws IOException {
if (admin.isTableEnabled(TableName.valueOf(dataTable))) {
@@ -387,6 +370,17 @@ public class IndexUpgradeTool extends Configured {
}
}
+private void modifyTable(Admin admin, String dataTableFullName,
HashSet indexes)
+throws IOException {
+if (upgrade) {
+modifyIndexTable(admin, indexes);
+modifyDataTable(admin, dataTableFullName);
+} else {
+modifyDataTable(admin, dataTableFullName);
+modifyIndexTable(admin, indexes);
+}
+}
+
private void enableTable(Admin admin, String dataTable,
HashSetindexes)
throws IOException {
if (!admin.isTableEnabled(TableName.valueOf(dataTable))) {
@@ -409,6 +403,17 @@ public class IndexUpgradeTool extends Configured {
}
}
+private void rebuildIndexes(Connection conn, Configuration conf, String
dataTableFullName) {
+if (upgrade) {
+prepareToRebuildIndexes(conn, dataTableFullName);
+if(!test) {
+indexingTool =
[phoenix] branch 4.14-HBase-1.4 updated: PHOENIX-5395: IndexUpgradeTool passes data table instead of view for post upgrade view index rebuild
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.4 by this push:
new 55fe5fd PHOENIX-5395: IndexUpgradeTool passes data table instead of
view for post upgrade view index rebuild
55fe5fd is described below
commit 55fe5fd2daa83e0de3dc521d5ba83a2055a76464
Author: s.kadam
AuthorDate: Mon Jul 22 15:45:24 2019 -0700
PHOENIX-5395: IndexUpgradeTool passes data table instead of view for post
upgrade view index rebuild
---
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 198 +++--
1 file changed, 141 insertions(+), 57 deletions(-)
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 0da4153..7855c40 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
@@ -92,7 +92,8 @@ public class IndexUpgradeTool extends Configured {
"Log file path where the logs are written");
private static final Option INDEX_SYNC_REBUILD_OPTION = new Option("sr",
"index-sync-rebuild",
false,
-"[Optional]Whether or not synchronously rebuild the indexes;
default rebuild asynchronous");
+"[Optional]Whether or not synchronously rebuild the indexes; "
++ "default rebuild asynchronous");
public static final String UPGRADE_OP = "upgrade";
public static final String ROLLBACK_OP = "rollback";
@@ -100,7 +101,7 @@ public class IndexUpgradeTool extends Configured {
private IndexTool indexingTool;
private HashMap> tablesAndIndexes = new
HashMap<>();
-private HashMap> rebuildMap = new
HashMap<>();
+private HashMap> rebuildMap = new
HashMap<>();
private HashMap prop = new HashMap<>();
private boolean dryRun, upgrade, syncRebuild;
@@ -128,7 +129,6 @@ public class IndexUpgradeTool extends Configured {
}
public void setTest(boolean test) { this.test = test; }
-
public boolean getDryRun() {
return this.dryRun;
}
@@ -339,13 +339,7 @@ public class IndexUpgradeTool extends Configured {
disableTable(admin, dataTableFullName, indexes);
modifyTable(admin, dataTableFullName, indexes);
enableTable(admin, dataTableFullName, indexes);
-if (upgrade) {
-if(!test) {
-indexingTool = new IndexTool();
-}
-indexingTool.setConf(conf);
-rebuildIndexes(dataTableFullName, indexingTool);
-}
+rebuildIndexes(conn, conf, dataTableFullName);
} catch (IOException | SQLException | InterruptedException e) {
LOGGER.severe("Something went wrong while executing " +
operation + " steps " + e);
return -1;
@@ -354,17 +348,6 @@ public class IndexUpgradeTool extends Configured {
return 0;
}
-private void modifyTable(Admin admin, String dataTableFullName,
HashSet indexes)
-throws IOException {
-if (upgrade) {
-modifyIndexTable(admin, indexes);
-modifyDataTable(admin, dataTableFullName);
-} else {
-modifyDataTable(admin, dataTableFullName);
-modifyIndexTable(admin, indexes);
-}
-}
-
private void disableTable(Admin admin, String dataTable,
HashSetindexes)
throws IOException {
if (admin.isTableEnabled(TableName.valueOf(dataTable))) {
@@ -387,6 +370,17 @@ public class IndexUpgradeTool extends Configured {
}
}
+private void modifyTable(Admin admin, String dataTableFullName,
HashSet indexes)
+throws IOException {
+if (upgrade) {
+modifyIndexTable(admin, indexes);
+modifyDataTable(admin, dataTableFullName);
+} else {
+modifyDataTable(admin, dataTableFullName);
+modifyIndexTable(admin, indexes);
+}
+}
+
private void enableTable(Admin admin, String dataTable,
HashSetindexes)
throws IOException {
if (!admin.isTableEnabled(TableName.valueOf(dataTable))) {
@@ -409,6 +403,17 @@ public class IndexUpgradeTool extends Configured {
}
}
+private void rebuildIndexes(Connection conn, Configuration conf, String
dataTableFullName) {
+if (upgrade) {
+prepareToRebuildIndexes(conn, dataTableFullName);
+if(!test) {
+indexingTool =
[phoenix] branch master updated: PHOENIX-5395: IndexUpgradeTool passes data table instead of view for post upgrade view index rebuild
This is an automated email from the ASF dual-hosted git repository.
skadam 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 ca5fedd PHOENIX-5395: IndexUpgradeTool passes data table instead of
view for post upgrade view index rebuild
ca5fedd is described below
commit ca5fef9e19ae4ca220f8e7af704253ef65fe
Author: s.kadam
AuthorDate: Mon Jul 22 16:28:33 2019 -0700
PHOENIX-5395: IndexUpgradeTool passes data table instead of view for post
upgrade view index rebuild
---
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 179 +++--
1 file changed, 133 insertions(+), 46 deletions(-)
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 4d68165..861fb66 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
@@ -100,7 +100,7 @@ public class IndexUpgradeTool extends Configured {
private IndexTool indexingTool;
private HashMap> tablesAndIndexes = new
HashMap<>();
-private HashMap> rebuildMap = new
HashMap<>();
+private HashMap> rebuildMap = new
HashMap<>();
private HashMap prop = new HashMap<>();
private boolean dryRun, upgrade, syncRebuild;
@@ -339,13 +339,7 @@ public class IndexUpgradeTool extends Configured {
disableTable(admin, dataTableFullName, indexes);
modifyTable(admin, dataTableFullName, indexes);
enableTable(admin, dataTableFullName, indexes);
-if (upgrade) {
-if(!test) {
-indexingTool = new IndexTool();
-}
-indexingTool.setConf(conf);
-rebuildIndexes(dataTableFullName, indexingTool);
-}
+rebuildIndexes(conn, conf, dataTableFullName);
} catch (IOException | SQLException | InterruptedException e) {
LOGGER.severe("Something went wrong while executing " +
operation + " steps " + e);
return -1;
@@ -410,6 +404,17 @@ public class IndexUpgradeTool extends Configured {
}
}
+private void rebuildIndexes(Connection conn, Configuration conf, String
dataTableFullName) {
+if (upgrade) {
+prepareToRebuildIndexes(conn, dataTableFullName);
+if(!test) {
+indexingTool = new IndexTool();
+}
+indexingTool.setConf(conf);
+rebuildIndexes(dataTableFullName, indexingTool);
+}
+}
+
private void modifyDataTable(Admin admin, String tableName)
throws IOException {
TableDescriptorBuilder tableDescBuilder = TableDescriptorBuilder
@@ -464,41 +469,48 @@ public class IndexUpgradeTool extends Configured {
}
}
}
-
private int rebuildIndexes(String dataTable, IndexTool indexingTool) {
-String schema = SchemaUtil.getSchemaNameFromFullName(dataTable);
-String table = SchemaUtil.getTableNameFromFullName(dataTable);
-for(Map.Entry indexMap :
rebuildMap.get(dataTable).entrySet()) {
+for(Map.Entry indexMap :
rebuildMap.get(dataTable).entrySet()) {
String index = indexMap.getKey();
-String tenantId = indexMap.getValue();
+IndexInfo indexInfo = indexMap.getValue();
String indexName = SchemaUtil.getTableNameFromFullName(index);
-String outFile = "/tmp/index_rebuild_" + indexName +
-(GLOBAL_INDEX_ID.equals(tenantId)?"":"_"+tenantId) +"_"+
UUID.randomUUID().toString();
-String[] args =
-{ "-s", schema, "-dt", table, "-it", indexName, "-direct",
"-op", outFile };
-ArrayList list = new ArrayList<>(Arrays.asList(args));
-if (!GLOBAL_INDEX_ID.equals(tenantId)) {
-list.add("-tenant");
-list.add(tenantId);
-}
-if (syncRebuild) {
-list.add("-runfg");
-}
-args = list.toArray(new String[list.size()]);
+String tenantId = indexInfo.getTenantId();
+String baseTable = indexInfo.getBaseTable();
+String schema = indexInfo.getSchemaName();
+String outFile = "/tmp/index_rebuild_" +schema+"_"+ indexName +
+(GLOBAL_INDEX_ID.equals(tenantId)?"":"_"+tenantId) +"_"
++ UUID.randomUUID().toString();
+String[] args = g
[phoenix] branch master updated: PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor (#538)
This is an automated email from the ASF dual-hosted git repository.
skadam 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 6a7115c PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
(#538)
6a7115c is described below
commit 6a7115c2862ae90b4d200057a0523a5fb4163fa7
Author: Priyank Porwal
AuthorDate: Wed Jul 17 16:16:19 2019 -0700
PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor (#538)
---
.../phoenix/hbase/index/IndexRegionObserver.java | 110 +++--
.../org/apache/phoenix/hbase/index/Indexer.java| 2 +-
.../hbase/index/metrics/MetricsIndexerSource.java | 54 ++
.../index/metrics/MetricsIndexerSourceFactory.java | 10 +-
.../index/metrics/MetricsIndexerSourceImpl.java| 50 ++
5 files changed, 125 insertions(+), 101 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
index 9adb8b5..f09ed75 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
@@ -70,27 +70,20 @@ import org.apache.phoenix.hbase.index.builder.IndexBuilder;
import org.apache.phoenix.hbase.index.covered.IndexMetaData;
import org.apache.phoenix.hbase.index.metrics.MetricsIndexerSource;
import org.apache.phoenix.hbase.index.metrics.MetricsIndexerSourceFactory;
-import org.apache.phoenix.hbase.index.table.HTableInterfaceReference;
import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
import org.apache.phoenix.hbase.index.util.IndexManagementUtil;
-import org.apache.phoenix.hbase.index.write.IndexFailurePolicy;
import org.apache.phoenix.hbase.index.write.IndexWriter;
import org.apache.phoenix.hbase.index.write.LazyParallelWriterIndexCommitter;
-import org.apache.phoenix.hbase.index.write.RecoveryIndexWriter;
-import org.apache.phoenix.hbase.index.write.recovery.PerRegionIndexWriteCache;
-import
org.apache.phoenix.hbase.index.write.recovery.StoreFailuresInCachePolicy;
import org.apache.phoenix.index.IndexMaintainer;
import org.apache.phoenix.index.PhoenixIndexMetaData;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.trace.TracingUtils;
import org.apache.phoenix.trace.util.NullSpan;
import org.apache.phoenix.util.EnvironmentEdgeManager;
-import org.apache.phoenix.util.ScanUtil;
import org.apache.phoenix.util.ServerUtil;
import org.apache.phoenix.util.ServerUtil.ConnectionType;
import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
/**
* Do all the work of managing index updates from a single coprocessor. All
Puts/Delets are passed
@@ -212,20 +205,11 @@ public class IndexRegionObserver implements
RegionObserver, RegionCoprocessor {
// The collection of pending data table rows
private Map pendingRows = new
ConcurrentHashMap<>();
- /**
- * cache the failed updates to the various regions. Used for making the WAL
recovery mechanisms
- * more robust in the face of recoverying index regions that were on the
same server as the
- * primary table region
- */
- private PerRegionIndexWriteCache failedIndexEdits = new
PerRegionIndexWriteCache();
-
private MetricsIndexerSource metricSource;
private boolean stopped;
private boolean disabled;
- private long slowIndexWriteThreshold;
private long slowIndexPrepareThreshold;
- private long slowPostOpenThreshold;
private long slowPreIncrementThreshold;
private int rowLockWaitDuration;
@@ -266,7 +250,7 @@ public class IndexRegionObserver implements RegionObserver,
RegionCoprocessor {
this.lockManager = new LockManager();
// Metrics impl for the Indexer -- avoiding unnecessary indirection
for hadoop-1/2 compat
-this.metricSource = MetricsIndexerSourceFactory.getInstance().create();
+this.metricSource =
MetricsIndexerSourceFactory.getInstance().getIndexerSource();
setSlowThresholds(e.getConfiguration());
} catch (NoSuchMethodError ex) {
@@ -281,10 +265,6 @@ public class IndexRegionObserver implements
RegionObserver, RegionCoprocessor {
private void setSlowThresholds(Configuration c) {
slowIndexPrepareThreshold =
c.getLong(INDEXER_INDEX_WRITE_SLOW_THRESHOLD_KEY,
INDEXER_INDEX_WRITE_SLOW_THRESHOLD_DEFAULT);
- slowIndexWriteThreshold =
c.getLong(INDEXER_INDEX_PREPARE_SLOW_THRESHOLD_KEY,
- INDEXER_INDEX_PREPARE_SLOW_THREHSOLD_DEFAULT);
- slowPostOpenThreshold = c.getLong(INDEXER_POST_OPEN_SLOW_THRESHOLD_KEY,
- INDEXER_POST_OPEN_SLOW_THRESHOLD_DEFAULT);
slowPreIncrementThreshold =
c.getLong(INDEXER_PRE_INCREMENT_SLOW_THRESHOLD_KEY,
INDEXER_PRE_INCREMENT_SLOW_THRESHOLD_D
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
This is an automated email from the ASF dual-hosted git repository.
skadam 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 33d34b7 PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
33d34b7 is described below
commit 33d34b72ecc7bfa55bf2998f7d8d7d90731a2a84
Author: Priyank Porwal
AuthorDate: Fri Jul 12 09:41:33 2019 -0700
PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
Signed-off-by: s.kadam
---
.../phoenix/hbase/index/IndexRegionObserver.java | 110 +++--
.../org/apache/phoenix/hbase/index/Indexer.java| 2 +-
.../hbase/index/metrics/MetricsIndexerSource.java | 54 ++
.../index/metrics/MetricsIndexerSourceFactory.java | 10 +-
.../index/metrics/MetricsIndexerSourceImpl.java| 50 ++
5 files changed, 125 insertions(+), 101 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
index 516a088..7c37c7a 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
@@ -66,27 +66,20 @@ import org.apache.phoenix.hbase.index.builder.IndexBuilder;
import org.apache.phoenix.hbase.index.covered.IndexMetaData;
import org.apache.phoenix.hbase.index.metrics.MetricsIndexerSource;
import org.apache.phoenix.hbase.index.metrics.MetricsIndexerSourceFactory;
-import org.apache.phoenix.hbase.index.table.HTableInterfaceReference;
import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
import org.apache.phoenix.hbase.index.util.IndexManagementUtil;
-import org.apache.phoenix.hbase.index.write.IndexFailurePolicy;
import org.apache.phoenix.hbase.index.write.IndexWriter;
import org.apache.phoenix.hbase.index.write.LazyParallelWriterIndexCommitter;
-import org.apache.phoenix.hbase.index.write.RecoveryIndexWriter;
-import org.apache.phoenix.hbase.index.write.recovery.PerRegionIndexWriteCache;
-import
org.apache.phoenix.hbase.index.write.recovery.StoreFailuresInCachePolicy;
import org.apache.phoenix.index.IndexMaintainer;
import org.apache.phoenix.index.PhoenixIndexMetaData;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.trace.TracingUtils;
import org.apache.phoenix.trace.util.NullSpan;
import org.apache.phoenix.util.EnvironmentEdgeManager;
-import org.apache.phoenix.util.ScanUtil;
import org.apache.phoenix.util.ServerUtil;
import org.apache.phoenix.util.ServerUtil.ConnectionType;
import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
/**
* Do all the work of managing index updates from a single coprocessor. All
Puts/Delets are passed
@@ -208,20 +201,11 @@ public class IndexRegionObserver extends
BaseRegionObserver {
// The collection of pending data table rows
private Map pendingRows = new
ConcurrentHashMap<>();
- /**
- * cache the failed updates to the various regions. Used for making the WAL
recovery mechanisms
- * more robust in the face of recoverying index regions that were on the
same server as the
- * primary table region
- */
- private PerRegionIndexWriteCache failedIndexEdits = new
PerRegionIndexWriteCache();
-
private MetricsIndexerSource metricSource;
private boolean stopped;
private boolean disabled;
- private long slowIndexWriteThreshold;
private long slowIndexPrepareThreshold;
- private long slowPostOpenThreshold;
private long slowPreIncrementThreshold;
private int rowLockWaitDuration;
@@ -259,7 +243,7 @@ public class IndexRegionObserver extends BaseRegionObserver
{
this.lockManager = new LockManager();
// Metrics impl for the Indexer -- avoiding unnecessary indirection
for hadoop-1/2 compat
- this.metricSource =
MetricsIndexerSourceFactory.getInstance().create();
+ this.metricSource =
MetricsIndexerSourceFactory.getInstance().getIndexerSource();
setSlowThresholds(e.getConfiguration());
} catch (NoSuchMethodError ex) {
disabled = true;
@@ -274,10 +258,6 @@ public class IndexRegionObserver extends
BaseRegionObserver {
private void setSlowThresholds(Configuration c) {
slowIndexPrepareThreshold =
c.getLong(INDEXER_INDEX_WRITE_SLOW_THRESHOLD_KEY,
INDEXER_INDEX_WRITE_SLOW_THRESHOLD_DEFAULT);
- slowIndexWriteThreshold =
c.getLong(INDEXER_INDEX_PREPARE_SLOW_THRESHOLD_KEY,
- INDEXER_INDEX_PREPARE_SLOW_THREHSOLD_DEFAULT);
- slowPostOpenThreshold = c.getLong(INDEXER_POST_OPEN_SLOW_THRESHOLD_KEY,
- INDEXER_POST_OPEN_SLOW_THRESHOLD_DEFAULT);
slowPreIncrementThreshold =
c.getLong(INDEXER_PRE_INCREMENT_SLOW_THRESHO
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
This is an automated email from the ASF dual-hosted git repository.
skadam 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 fa287f1 PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
fa287f1 is described below
commit fa287f135ce81508182dc6b7eca7ab49bfbeff8a
Author: Priyank Porwal
AuthorDate: Fri Jul 12 09:41:33 2019 -0700
PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
Signed-off-by: s.kadam
---
.../phoenix/hbase/index/IndexRegionObserver.java | 110 +++--
.../org/apache/phoenix/hbase/index/Indexer.java| 2 +-
.../hbase/index/metrics/MetricsIndexerSource.java | 54 ++
.../index/metrics/MetricsIndexerSourceFactory.java | 10 +-
.../index/metrics/MetricsIndexerSourceImpl.java| 50 ++
5 files changed, 125 insertions(+), 101 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
index 516a088..7c37c7a 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
@@ -66,27 +66,20 @@ import org.apache.phoenix.hbase.index.builder.IndexBuilder;
import org.apache.phoenix.hbase.index.covered.IndexMetaData;
import org.apache.phoenix.hbase.index.metrics.MetricsIndexerSource;
import org.apache.phoenix.hbase.index.metrics.MetricsIndexerSourceFactory;
-import org.apache.phoenix.hbase.index.table.HTableInterfaceReference;
import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
import org.apache.phoenix.hbase.index.util.IndexManagementUtil;
-import org.apache.phoenix.hbase.index.write.IndexFailurePolicy;
import org.apache.phoenix.hbase.index.write.IndexWriter;
import org.apache.phoenix.hbase.index.write.LazyParallelWriterIndexCommitter;
-import org.apache.phoenix.hbase.index.write.RecoveryIndexWriter;
-import org.apache.phoenix.hbase.index.write.recovery.PerRegionIndexWriteCache;
-import
org.apache.phoenix.hbase.index.write.recovery.StoreFailuresInCachePolicy;
import org.apache.phoenix.index.IndexMaintainer;
import org.apache.phoenix.index.PhoenixIndexMetaData;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.trace.TracingUtils;
import org.apache.phoenix.trace.util.NullSpan;
import org.apache.phoenix.util.EnvironmentEdgeManager;
-import org.apache.phoenix.util.ScanUtil;
import org.apache.phoenix.util.ServerUtil;
import org.apache.phoenix.util.ServerUtil.ConnectionType;
import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
/**
* Do all the work of managing index updates from a single coprocessor. All
Puts/Delets are passed
@@ -208,20 +201,11 @@ public class IndexRegionObserver extends
BaseRegionObserver {
// The collection of pending data table rows
private Map pendingRows = new
ConcurrentHashMap<>();
- /**
- * cache the failed updates to the various regions. Used for making the WAL
recovery mechanisms
- * more robust in the face of recoverying index regions that were on the
same server as the
- * primary table region
- */
- private PerRegionIndexWriteCache failedIndexEdits = new
PerRegionIndexWriteCache();
-
private MetricsIndexerSource metricSource;
private boolean stopped;
private boolean disabled;
- private long slowIndexWriteThreshold;
private long slowIndexPrepareThreshold;
- private long slowPostOpenThreshold;
private long slowPreIncrementThreshold;
private int rowLockWaitDuration;
@@ -259,7 +243,7 @@ public class IndexRegionObserver extends BaseRegionObserver
{
this.lockManager = new LockManager();
// Metrics impl for the Indexer -- avoiding unnecessary indirection
for hadoop-1/2 compat
- this.metricSource =
MetricsIndexerSourceFactory.getInstance().create();
+ this.metricSource =
MetricsIndexerSourceFactory.getInstance().getIndexerSource();
setSlowThresholds(e.getConfiguration());
} catch (NoSuchMethodError ex) {
disabled = true;
@@ -274,10 +258,6 @@ public class IndexRegionObserver extends
BaseRegionObserver {
private void setSlowThresholds(Configuration c) {
slowIndexPrepareThreshold =
c.getLong(INDEXER_INDEX_WRITE_SLOW_THRESHOLD_KEY,
INDEXER_INDEX_WRITE_SLOW_THRESHOLD_DEFAULT);
- slowIndexWriteThreshold =
c.getLong(INDEXER_INDEX_PREPARE_SLOW_THRESHOLD_KEY,
- INDEXER_INDEX_PREPARE_SLOW_THREHSOLD_DEFAULT);
- slowPostOpenThreshold = c.getLong(INDEXER_POST_OPEN_SLOW_THRESHOLD_KEY,
- INDEXER_POST_OPEN_SLOW_THRESHOLD_DEFAULT);
slowPreIncrementThreshold =
c.getLong(INDEXER_PRE_INCREMENT_SLOW_THRESHO
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
This is an automated email from the ASF dual-hosted git repository.
skadam 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 a2ee6c1 PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
a2ee6c1 is described below
commit a2ee6c15462932b2ad8eab451d0a4113ff66d288
Author: Priyank Porwal
AuthorDate: Fri Jul 12 09:41:33 2019 -0700
PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
Signed-off-by: s.kadam
---
.../phoenix/hbase/index/IndexRegionObserver.java | 110 +++--
.../org/apache/phoenix/hbase/index/Indexer.java| 2 +-
.../hbase/index/metrics/MetricsIndexerSource.java | 54 ++
.../index/metrics/MetricsIndexerSourceFactory.java | 10 +-
.../index/metrics/MetricsIndexerSourceImpl.java| 50 ++
5 files changed, 125 insertions(+), 101 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
index 516a088..7c37c7a 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
@@ -66,27 +66,20 @@ import org.apache.phoenix.hbase.index.builder.IndexBuilder;
import org.apache.phoenix.hbase.index.covered.IndexMetaData;
import org.apache.phoenix.hbase.index.metrics.MetricsIndexerSource;
import org.apache.phoenix.hbase.index.metrics.MetricsIndexerSourceFactory;
-import org.apache.phoenix.hbase.index.table.HTableInterfaceReference;
import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
import org.apache.phoenix.hbase.index.util.IndexManagementUtil;
-import org.apache.phoenix.hbase.index.write.IndexFailurePolicy;
import org.apache.phoenix.hbase.index.write.IndexWriter;
import org.apache.phoenix.hbase.index.write.LazyParallelWriterIndexCommitter;
-import org.apache.phoenix.hbase.index.write.RecoveryIndexWriter;
-import org.apache.phoenix.hbase.index.write.recovery.PerRegionIndexWriteCache;
-import
org.apache.phoenix.hbase.index.write.recovery.StoreFailuresInCachePolicy;
import org.apache.phoenix.index.IndexMaintainer;
import org.apache.phoenix.index.PhoenixIndexMetaData;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.trace.TracingUtils;
import org.apache.phoenix.trace.util.NullSpan;
import org.apache.phoenix.util.EnvironmentEdgeManager;
-import org.apache.phoenix.util.ScanUtil;
import org.apache.phoenix.util.ServerUtil;
import org.apache.phoenix.util.ServerUtil.ConnectionType;
import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
/**
* Do all the work of managing index updates from a single coprocessor. All
Puts/Delets are passed
@@ -208,20 +201,11 @@ public class IndexRegionObserver extends
BaseRegionObserver {
// The collection of pending data table rows
private Map pendingRows = new
ConcurrentHashMap<>();
- /**
- * cache the failed updates to the various regions. Used for making the WAL
recovery mechanisms
- * more robust in the face of recoverying index regions that were on the
same server as the
- * primary table region
- */
- private PerRegionIndexWriteCache failedIndexEdits = new
PerRegionIndexWriteCache();
-
private MetricsIndexerSource metricSource;
private boolean stopped;
private boolean disabled;
- private long slowIndexWriteThreshold;
private long slowIndexPrepareThreshold;
- private long slowPostOpenThreshold;
private long slowPreIncrementThreshold;
private int rowLockWaitDuration;
@@ -259,7 +243,7 @@ public class IndexRegionObserver extends BaseRegionObserver
{
this.lockManager = new LockManager();
// Metrics impl for the Indexer -- avoiding unnecessary indirection
for hadoop-1/2 compat
- this.metricSource =
MetricsIndexerSourceFactory.getInstance().create();
+ this.metricSource =
MetricsIndexerSourceFactory.getInstance().getIndexerSource();
setSlowThresholds(e.getConfiguration());
} catch (NoSuchMethodError ex) {
disabled = true;
@@ -274,10 +258,6 @@ public class IndexRegionObserver extends
BaseRegionObserver {
private void setSlowThresholds(Configuration c) {
slowIndexPrepareThreshold =
c.getLong(INDEXER_INDEX_WRITE_SLOW_THRESHOLD_KEY,
INDEXER_INDEX_WRITE_SLOW_THRESHOLD_DEFAULT);
- slowIndexWriteThreshold =
c.getLong(INDEXER_INDEX_PREPARE_SLOW_THRESHOLD_KEY,
- INDEXER_INDEX_PREPARE_SLOW_THREHSOLD_DEFAULT);
- slowPostOpenThreshold = c.getLong(INDEXER_POST_OPEN_SLOW_THRESHOLD_KEY,
- INDEXER_POST_OPEN_SLOW_THRESHOLD_DEFAULT);
slowPreIncrementThreshold =
c.getLong(INDEXER_PRE_INCREMENT_SLOW_THRESHO
[phoenix] branch 4.14-HBase-1.4 updated: PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.4 by this push:
new cc97a5f PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
cc97a5f is described below
commit cc97a5fa068ca26e75f6cbec7cfe31c470794c49
Author: Priyank Porwal
AuthorDate: Fri Jul 12 09:41:33 2019 -0700
PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
Signed-off-by: s.kadam
---
.../phoenix/hbase/index/IndexRegionObserver.java | 110 +++--
.../org/apache/phoenix/hbase/index/Indexer.java| 2 +-
.../hbase/index/metrics/MetricsIndexerSource.java | 54 ++
.../index/metrics/MetricsIndexerSourceFactory.java | 10 +-
.../index/metrics/MetricsIndexerSourceImpl.java| 50 ++
5 files changed, 125 insertions(+), 101 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
index 516a088..7c37c7a 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
@@ -66,27 +66,20 @@ import org.apache.phoenix.hbase.index.builder.IndexBuilder;
import org.apache.phoenix.hbase.index.covered.IndexMetaData;
import org.apache.phoenix.hbase.index.metrics.MetricsIndexerSource;
import org.apache.phoenix.hbase.index.metrics.MetricsIndexerSourceFactory;
-import org.apache.phoenix.hbase.index.table.HTableInterfaceReference;
import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
import org.apache.phoenix.hbase.index.util.IndexManagementUtil;
-import org.apache.phoenix.hbase.index.write.IndexFailurePolicy;
import org.apache.phoenix.hbase.index.write.IndexWriter;
import org.apache.phoenix.hbase.index.write.LazyParallelWriterIndexCommitter;
-import org.apache.phoenix.hbase.index.write.RecoveryIndexWriter;
-import org.apache.phoenix.hbase.index.write.recovery.PerRegionIndexWriteCache;
-import
org.apache.phoenix.hbase.index.write.recovery.StoreFailuresInCachePolicy;
import org.apache.phoenix.index.IndexMaintainer;
import org.apache.phoenix.index.PhoenixIndexMetaData;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.trace.TracingUtils;
import org.apache.phoenix.trace.util.NullSpan;
import org.apache.phoenix.util.EnvironmentEdgeManager;
-import org.apache.phoenix.util.ScanUtil;
import org.apache.phoenix.util.ServerUtil;
import org.apache.phoenix.util.ServerUtil.ConnectionType;
import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
/**
* Do all the work of managing index updates from a single coprocessor. All
Puts/Delets are passed
@@ -208,20 +201,11 @@ public class IndexRegionObserver extends
BaseRegionObserver {
// The collection of pending data table rows
private Map pendingRows = new
ConcurrentHashMap<>();
- /**
- * cache the failed updates to the various regions. Used for making the WAL
recovery mechanisms
- * more robust in the face of recoverying index regions that were on the
same server as the
- * primary table region
- */
- private PerRegionIndexWriteCache failedIndexEdits = new
PerRegionIndexWriteCache();
-
private MetricsIndexerSource metricSource;
private boolean stopped;
private boolean disabled;
- private long slowIndexWriteThreshold;
private long slowIndexPrepareThreshold;
- private long slowPostOpenThreshold;
private long slowPreIncrementThreshold;
private int rowLockWaitDuration;
@@ -259,7 +243,7 @@ public class IndexRegionObserver extends BaseRegionObserver
{
this.lockManager = new LockManager();
// Metrics impl for the Indexer -- avoiding unnecessary indirection
for hadoop-1/2 compat
- this.metricSource =
MetricsIndexerSourceFactory.getInstance().create();
+ this.metricSource =
MetricsIndexerSourceFactory.getInstance().getIndexerSource();
setSlowThresholds(e.getConfiguration());
} catch (NoSuchMethodError ex) {
disabled = true;
@@ -274,10 +258,6 @@ public class IndexRegionObserver extends
BaseRegionObserver {
private void setSlowThresholds(Configuration c) {
slowIndexPrepareThreshold =
c.getLong(INDEXER_INDEX_WRITE_SLOW_THRESHOLD_KEY,
INDEXER_INDEX_WRITE_SLOW_THRESHOLD_DEFAULT);
- slowIndexWriteThreshold =
c.getLong(INDEXER_INDEX_PREPARE_SLOW_THRESHOLD_KEY,
- INDEXER_INDEX_PREPARE_SLOW_THREHSOLD_DEFAULT);
- slowPostOpenThreshold = c.getLong(INDEXER_POST_OPEN_SLOW_THRESHOLD_KEY,
- INDEXER_POST_OPEN_SLOW_THRESHOLD_DEFAULT);
slowPreIncrementThreshold =
c.getLong(INDEXER_PRE_INCREMENT_SLOW_THRESHO
[phoenix] branch 4.14-HBase-1.3 updated: PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.3 by this push:
new e027095 PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
e027095 is described below
commit e0270955d04c80367c9d34ce408e15f1bdf99c9c
Author: Priyank Porwal
AuthorDate: Fri Jul 12 09:41:33 2019 -0700
PHOENIX-5383: Metrics for the IndexRegionObserver coprocessor
Signed-off-by: s.kadam
---
.../phoenix/hbase/index/IndexRegionObserver.java | 110 +++--
.../org/apache/phoenix/hbase/index/Indexer.java| 2 +-
.../hbase/index/metrics/MetricsIndexerSource.java | 54 ++
.../index/metrics/MetricsIndexerSourceFactory.java | 10 +-
.../index/metrics/MetricsIndexerSourceImpl.java| 50 ++
5 files changed, 125 insertions(+), 101 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
index 516a088..7c37c7a 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
@@ -66,27 +66,20 @@ import org.apache.phoenix.hbase.index.builder.IndexBuilder;
import org.apache.phoenix.hbase.index.covered.IndexMetaData;
import org.apache.phoenix.hbase.index.metrics.MetricsIndexerSource;
import org.apache.phoenix.hbase.index.metrics.MetricsIndexerSourceFactory;
-import org.apache.phoenix.hbase.index.table.HTableInterfaceReference;
import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
import org.apache.phoenix.hbase.index.util.IndexManagementUtil;
-import org.apache.phoenix.hbase.index.write.IndexFailurePolicy;
import org.apache.phoenix.hbase.index.write.IndexWriter;
import org.apache.phoenix.hbase.index.write.LazyParallelWriterIndexCommitter;
-import org.apache.phoenix.hbase.index.write.RecoveryIndexWriter;
-import org.apache.phoenix.hbase.index.write.recovery.PerRegionIndexWriteCache;
-import
org.apache.phoenix.hbase.index.write.recovery.StoreFailuresInCachePolicy;
import org.apache.phoenix.index.IndexMaintainer;
import org.apache.phoenix.index.PhoenixIndexMetaData;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.trace.TracingUtils;
import org.apache.phoenix.trace.util.NullSpan;
import org.apache.phoenix.util.EnvironmentEdgeManager;
-import org.apache.phoenix.util.ScanUtil;
import org.apache.phoenix.util.ServerUtil;
import org.apache.phoenix.util.ServerUtil.ConnectionType;
import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
/**
* Do all the work of managing index updates from a single coprocessor. All
Puts/Delets are passed
@@ -208,20 +201,11 @@ public class IndexRegionObserver extends
BaseRegionObserver {
// The collection of pending data table rows
private Map pendingRows = new
ConcurrentHashMap<>();
- /**
- * cache the failed updates to the various regions. Used for making the WAL
recovery mechanisms
- * more robust in the face of recoverying index regions that were on the
same server as the
- * primary table region
- */
- private PerRegionIndexWriteCache failedIndexEdits = new
PerRegionIndexWriteCache();
-
private MetricsIndexerSource metricSource;
private boolean stopped;
private boolean disabled;
- private long slowIndexWriteThreshold;
private long slowIndexPrepareThreshold;
- private long slowPostOpenThreshold;
private long slowPreIncrementThreshold;
private int rowLockWaitDuration;
@@ -259,7 +243,7 @@ public class IndexRegionObserver extends BaseRegionObserver
{
this.lockManager = new LockManager();
// Metrics impl for the Indexer -- avoiding unnecessary indirection
for hadoop-1/2 compat
- this.metricSource =
MetricsIndexerSourceFactory.getInstance().create();
+ this.metricSource =
MetricsIndexerSourceFactory.getInstance().getIndexerSource();
setSlowThresholds(e.getConfiguration());
} catch (NoSuchMethodError ex) {
disabled = true;
@@ -274,10 +258,6 @@ public class IndexRegionObserver extends
BaseRegionObserver {
private void setSlowThresholds(Configuration c) {
slowIndexPrepareThreshold =
c.getLong(INDEXER_INDEX_WRITE_SLOW_THRESHOLD_KEY,
INDEXER_INDEX_WRITE_SLOW_THRESHOLD_DEFAULT);
- slowIndexWriteThreshold =
c.getLong(INDEXER_INDEX_PREPARE_SLOW_THRESHOLD_KEY,
- INDEXER_INDEX_PREPARE_SLOW_THREHSOLD_DEFAULT);
- slowPostOpenThreshold = c.getLong(INDEXER_POST_OPEN_SLOW_THRESHOLD_KEY,
- INDEXER_POST_OPEN_SLOW_THRESHOLD_DEFAULT);
slowPreIncrementThreshold =
c.getLong(INDEXER_PRE_INCREMENT_SLOW_THRESHO
[phoenix] branch master updated: PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
This is an automated email from the ASF dual-hosted git repository.
skadam 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 93b58e1 PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
93b58e1 is described below
commit 93b58e14478e58822b05af4fc4a0afb15ad5fcb2
Author: Priyank Porwal
AuthorDate: Mon Jul 8 16:20:10 2019 -0700
PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
Signed-off-by: s.kadam
---
.../index/metrics/GlobalIndexCheckerSource.java| 67 ++
.../metrics/GlobalIndexCheckerSourceImpl.java | 82 ++
.../index/metrics/MetricsIndexerSourceFactory.java | 8 +++
.../apache/phoenix/index/GlobalIndexChecker.java | 37 --
4 files changed, 187 insertions(+), 7 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
new file mode 100644
index 000..84b03d1
--- /dev/null
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
@@ -0,0 +1,67 @@
+/*
+ * 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.hbase.index.metrics;
+
+import org.apache.hadoop.hbase.metrics.BaseSource;
+
+/**
+ * Interface for metrics from GlobalIndexChecker
+ */
+public interface GlobalIndexCheckerSource extends BaseSource {
+// Metrics2 and JMX constants
+String METRICS_NAME = "GlobalIndexChecker";
+String METRICS_CONTEXT = "phoenix";
+String METRICS_DESCRIPTION = "Metrics about the Phoenix Global Index
Checker";
+String METRICS_JMX_CONTEXT = "RegionServer,sub=" + METRICS_NAME;
+
+String INDEX_REPAIR = "indexRepairs";
+String INDEX_REPAIR_DESC = "The number of index row repairs";
+
+String INDEX_REPAIR_FAILURE = "indexRepairFailures";
+String INDEX_REPAIR_FAILURE_DESC = "The number of index row repair
failures";
+
+String INDEX_REPAIR_TIME = "indexRepairTime";
+String INDEX_REPAIR_TIME_DESC = "Histogram for the time in milliseconds
for index row repairs";
+
+String INDEX_REPAIR_FAILURE_TIME = "indexRepairFailureTime";
+String INDEX_REPAIR_FAILURE_TIME_DESC = "Histogram for the time in
milliseconds for index row repair failures";
+
+/**
+ * Increments the number of index repairs
+ */
+void incrementIndexRepairs();
+
+/**
+ * Increments the number of index repair failures
+ */
+void incrementIndexRepairFailures();
+
+/**
+ * Updates the index repair time histogram
+ *
+ * @param t time taken in milliseconds
+ */
+void updateIndexRepairTime(long t);
+
+/**
+ * Updates the index repair failure time histogram
+ *
+ * @param t time taken in milliseconds
+ */
+void updateIndexRepairFailureTime(long t);
+}
\ No newline at end of file
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
new file mode 100644
index 000..f59851a
--- /dev/null
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
@@ -0,0 +1,82 @@
+/*
+ * 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,
+ * WITHOU
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
This is an automated email from the ASF dual-hosted git repository.
skadam 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 9da113f PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
9da113f is described below
commit 9da113f7335c953537c1498cbedaef7758fb3ce6
Author: Priyank Porwal
AuthorDate: Wed Jul 17 23:36:17 2019 -0700
PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
Signed-off-by: s.kadam
---
.../index/metrics/GlobalIndexCheckerSource.java| 67 ++
.../metrics/GlobalIndexCheckerSourceImpl.java | 82 ++
.../index/metrics/MetricsIndexerSourceFactory.java | 8 +++
.../apache/phoenix/index/GlobalIndexChecker.java | 31 ++--
4 files changed, 184 insertions(+), 4 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
new file mode 100644
index 000..84b03d1
--- /dev/null
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
@@ -0,0 +1,67 @@
+/*
+ * 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.hbase.index.metrics;
+
+import org.apache.hadoop.hbase.metrics.BaseSource;
+
+/**
+ * Interface for metrics from GlobalIndexChecker
+ */
+public interface GlobalIndexCheckerSource extends BaseSource {
+// Metrics2 and JMX constants
+String METRICS_NAME = "GlobalIndexChecker";
+String METRICS_CONTEXT = "phoenix";
+String METRICS_DESCRIPTION = "Metrics about the Phoenix Global Index
Checker";
+String METRICS_JMX_CONTEXT = "RegionServer,sub=" + METRICS_NAME;
+
+String INDEX_REPAIR = "indexRepairs";
+String INDEX_REPAIR_DESC = "The number of index row repairs";
+
+String INDEX_REPAIR_FAILURE = "indexRepairFailures";
+String INDEX_REPAIR_FAILURE_DESC = "The number of index row repair
failures";
+
+String INDEX_REPAIR_TIME = "indexRepairTime";
+String INDEX_REPAIR_TIME_DESC = "Histogram for the time in milliseconds
for index row repairs";
+
+String INDEX_REPAIR_FAILURE_TIME = "indexRepairFailureTime";
+String INDEX_REPAIR_FAILURE_TIME_DESC = "Histogram for the time in
milliseconds for index row repair failures";
+
+/**
+ * Increments the number of index repairs
+ */
+void incrementIndexRepairs();
+
+/**
+ * Increments the number of index repair failures
+ */
+void incrementIndexRepairFailures();
+
+/**
+ * Updates the index repair time histogram
+ *
+ * @param t time taken in milliseconds
+ */
+void updateIndexRepairTime(long t);
+
+/**
+ * Updates the index repair failure time histogram
+ *
+ * @param t time taken in milliseconds
+ */
+void updateIndexRepairFailureTime(long t);
+}
\ No newline at end of file
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
new file mode 100644
index 000..f59851a
--- /dev/null
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
@@ -0,0 +1,82 @@
+/*
+ * 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
[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
This is an automated email from the ASF dual-hosted git repository.
skadam 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 f79f8cb PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
f79f8cb is described below
commit f79f8cbccf8565d3763d1db583b0cb3b8d39109b
Author: Priyank Porwal
AuthorDate: Wed Jul 17 23:36:17 2019 -0700
PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
Signed-off-by: s.kadam
---
.../index/metrics/GlobalIndexCheckerSource.java| 67 ++
.../metrics/GlobalIndexCheckerSourceImpl.java | 82 ++
.../index/metrics/MetricsIndexerSourceFactory.java | 8 +++
.../apache/phoenix/index/GlobalIndexChecker.java | 31 ++--
4 files changed, 184 insertions(+), 4 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
new file mode 100644
index 000..84b03d1
--- /dev/null
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
@@ -0,0 +1,67 @@
+/*
+ * 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.hbase.index.metrics;
+
+import org.apache.hadoop.hbase.metrics.BaseSource;
+
+/**
+ * Interface for metrics from GlobalIndexChecker
+ */
+public interface GlobalIndexCheckerSource extends BaseSource {
+// Metrics2 and JMX constants
+String METRICS_NAME = "GlobalIndexChecker";
+String METRICS_CONTEXT = "phoenix";
+String METRICS_DESCRIPTION = "Metrics about the Phoenix Global Index
Checker";
+String METRICS_JMX_CONTEXT = "RegionServer,sub=" + METRICS_NAME;
+
+String INDEX_REPAIR = "indexRepairs";
+String INDEX_REPAIR_DESC = "The number of index row repairs";
+
+String INDEX_REPAIR_FAILURE = "indexRepairFailures";
+String INDEX_REPAIR_FAILURE_DESC = "The number of index row repair
failures";
+
+String INDEX_REPAIR_TIME = "indexRepairTime";
+String INDEX_REPAIR_TIME_DESC = "Histogram for the time in milliseconds
for index row repairs";
+
+String INDEX_REPAIR_FAILURE_TIME = "indexRepairFailureTime";
+String INDEX_REPAIR_FAILURE_TIME_DESC = "Histogram for the time in
milliseconds for index row repair failures";
+
+/**
+ * Increments the number of index repairs
+ */
+void incrementIndexRepairs();
+
+/**
+ * Increments the number of index repair failures
+ */
+void incrementIndexRepairFailures();
+
+/**
+ * Updates the index repair time histogram
+ *
+ * @param t time taken in milliseconds
+ */
+void updateIndexRepairTime(long t);
+
+/**
+ * Updates the index repair failure time histogram
+ *
+ * @param t time taken in milliseconds
+ */
+void updateIndexRepairFailureTime(long t);
+}
\ No newline at end of file
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
new file mode 100644
index 000..f59851a
--- /dev/null
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
@@ -0,0 +1,82 @@
+/*
+ * 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
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
This is an automated email from the ASF dual-hosted git repository.
skadam 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 cab22a2 PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
cab22a2 is described below
commit cab22a29a21707dd21c602537a1832f2f3ed555a
Author: Priyank Porwal
AuthorDate: Wed Jul 17 23:36:17 2019 -0700
PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
Signed-off-by: s.kadam
---
.../index/metrics/GlobalIndexCheckerSource.java| 67 ++
.../metrics/GlobalIndexCheckerSourceImpl.java | 82 ++
.../index/metrics/MetricsIndexerSourceFactory.java | 8 +++
.../apache/phoenix/index/GlobalIndexChecker.java | 31 ++--
4 files changed, 184 insertions(+), 4 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
new file mode 100644
index 000..84b03d1
--- /dev/null
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
@@ -0,0 +1,67 @@
+/*
+ * 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.hbase.index.metrics;
+
+import org.apache.hadoop.hbase.metrics.BaseSource;
+
+/**
+ * Interface for metrics from GlobalIndexChecker
+ */
+public interface GlobalIndexCheckerSource extends BaseSource {
+// Metrics2 and JMX constants
+String METRICS_NAME = "GlobalIndexChecker";
+String METRICS_CONTEXT = "phoenix";
+String METRICS_DESCRIPTION = "Metrics about the Phoenix Global Index
Checker";
+String METRICS_JMX_CONTEXT = "RegionServer,sub=" + METRICS_NAME;
+
+String INDEX_REPAIR = "indexRepairs";
+String INDEX_REPAIR_DESC = "The number of index row repairs";
+
+String INDEX_REPAIR_FAILURE = "indexRepairFailures";
+String INDEX_REPAIR_FAILURE_DESC = "The number of index row repair
failures";
+
+String INDEX_REPAIR_TIME = "indexRepairTime";
+String INDEX_REPAIR_TIME_DESC = "Histogram for the time in milliseconds
for index row repairs";
+
+String INDEX_REPAIR_FAILURE_TIME = "indexRepairFailureTime";
+String INDEX_REPAIR_FAILURE_TIME_DESC = "Histogram for the time in
milliseconds for index row repair failures";
+
+/**
+ * Increments the number of index repairs
+ */
+void incrementIndexRepairs();
+
+/**
+ * Increments the number of index repair failures
+ */
+void incrementIndexRepairFailures();
+
+/**
+ * Updates the index repair time histogram
+ *
+ * @param t time taken in milliseconds
+ */
+void updateIndexRepairTime(long t);
+
+/**
+ * Updates the index repair failure time histogram
+ *
+ * @param t time taken in milliseconds
+ */
+void updateIndexRepairFailureTime(long t);
+}
\ No newline at end of file
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
new file mode 100644
index 000..f59851a
--- /dev/null
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
@@ -0,0 +1,82 @@
+/*
+ * 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
[phoenix] branch 4.14-HBase-1.3 updated: PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.3 by this push:
new 9c0e8d6 PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
9c0e8d6 is described below
commit 9c0e8d64ee9074f67b47820d4e8c5d9449a816f0
Author: Priyank Porwal
AuthorDate: Wed Jul 17 23:36:17 2019 -0700
PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
Signed-off-by: s.kadam
---
.../index/metrics/GlobalIndexCheckerSource.java| 67 ++
.../metrics/GlobalIndexCheckerSourceImpl.java | 82 ++
.../index/metrics/MetricsIndexerSourceFactory.java | 8 +++
.../apache/phoenix/index/GlobalIndexChecker.java | 31 ++--
4 files changed, 184 insertions(+), 4 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
new file mode 100644
index 000..84b03d1
--- /dev/null
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
@@ -0,0 +1,67 @@
+/*
+ * 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.hbase.index.metrics;
+
+import org.apache.hadoop.hbase.metrics.BaseSource;
+
+/**
+ * Interface for metrics from GlobalIndexChecker
+ */
+public interface GlobalIndexCheckerSource extends BaseSource {
+// Metrics2 and JMX constants
+String METRICS_NAME = "GlobalIndexChecker";
+String METRICS_CONTEXT = "phoenix";
+String METRICS_DESCRIPTION = "Metrics about the Phoenix Global Index
Checker";
+String METRICS_JMX_CONTEXT = "RegionServer,sub=" + METRICS_NAME;
+
+String INDEX_REPAIR = "indexRepairs";
+String INDEX_REPAIR_DESC = "The number of index row repairs";
+
+String INDEX_REPAIR_FAILURE = "indexRepairFailures";
+String INDEX_REPAIR_FAILURE_DESC = "The number of index row repair
failures";
+
+String INDEX_REPAIR_TIME = "indexRepairTime";
+String INDEX_REPAIR_TIME_DESC = "Histogram for the time in milliseconds
for index row repairs";
+
+String INDEX_REPAIR_FAILURE_TIME = "indexRepairFailureTime";
+String INDEX_REPAIR_FAILURE_TIME_DESC = "Histogram for the time in
milliseconds for index row repair failures";
+
+/**
+ * Increments the number of index repairs
+ */
+void incrementIndexRepairs();
+
+/**
+ * Increments the number of index repair failures
+ */
+void incrementIndexRepairFailures();
+
+/**
+ * Updates the index repair time histogram
+ *
+ * @param t time taken in milliseconds
+ */
+void updateIndexRepairTime(long t);
+
+/**
+ * Updates the index repair failure time histogram
+ *
+ * @param t time taken in milliseconds
+ */
+void updateIndexRepairFailureTime(long t);
+}
\ No newline at end of file
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
new file mode 100644
index 000..f59851a
--- /dev/null
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
@@ -0,0 +1,82 @@
+/*
+ * 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
[phoenix] branch 4.14-HBase-1.4 updated: PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.4 by this push:
new 4b30c48 PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
4b30c48 is described below
commit 4b30c48c9a2a8e6f9b5a005c8d916e555acf1f37
Author: Priyank Porwal
AuthorDate: Wed Jul 17 23:36:17 2019 -0700
PHOENIX-5358: Metrics for the GlobalIndexChecker coprocessor
Signed-off-by: s.kadam
---
.../index/metrics/GlobalIndexCheckerSource.java| 67 ++
.../metrics/GlobalIndexCheckerSourceImpl.java | 82 ++
.../index/metrics/MetricsIndexerSourceFactory.java | 8 +++
.../apache/phoenix/index/GlobalIndexChecker.java | 31 ++--
4 files changed, 184 insertions(+), 4 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
new file mode 100644
index 000..84b03d1
--- /dev/null
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSource.java
@@ -0,0 +1,67 @@
+/*
+ * 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.hbase.index.metrics;
+
+import org.apache.hadoop.hbase.metrics.BaseSource;
+
+/**
+ * Interface for metrics from GlobalIndexChecker
+ */
+public interface GlobalIndexCheckerSource extends BaseSource {
+// Metrics2 and JMX constants
+String METRICS_NAME = "GlobalIndexChecker";
+String METRICS_CONTEXT = "phoenix";
+String METRICS_DESCRIPTION = "Metrics about the Phoenix Global Index
Checker";
+String METRICS_JMX_CONTEXT = "RegionServer,sub=" + METRICS_NAME;
+
+String INDEX_REPAIR = "indexRepairs";
+String INDEX_REPAIR_DESC = "The number of index row repairs";
+
+String INDEX_REPAIR_FAILURE = "indexRepairFailures";
+String INDEX_REPAIR_FAILURE_DESC = "The number of index row repair
failures";
+
+String INDEX_REPAIR_TIME = "indexRepairTime";
+String INDEX_REPAIR_TIME_DESC = "Histogram for the time in milliseconds
for index row repairs";
+
+String INDEX_REPAIR_FAILURE_TIME = "indexRepairFailureTime";
+String INDEX_REPAIR_FAILURE_TIME_DESC = "Histogram for the time in
milliseconds for index row repair failures";
+
+/**
+ * Increments the number of index repairs
+ */
+void incrementIndexRepairs();
+
+/**
+ * Increments the number of index repair failures
+ */
+void incrementIndexRepairFailures();
+
+/**
+ * Updates the index repair time histogram
+ *
+ * @param t time taken in milliseconds
+ */
+void updateIndexRepairTime(long t);
+
+/**
+ * Updates the index repair failure time histogram
+ *
+ * @param t time taken in milliseconds
+ */
+void updateIndexRepairFailureTime(long t);
+}
\ No newline at end of file
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
new file mode 100644
index 000..f59851a
--- /dev/null
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/metrics/GlobalIndexCheckerSourceImpl.java
@@ -0,0 +1,82 @@
+/*
+ * 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
[phoenix] branch 4.14-HBase-1.4 updated: PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view indexes
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.4 by this push:
new 1aad9ca PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view
indexes
1aad9ca is described below
commit 1aad9ca52cf142bbf767a8566f6c0edfd1d6face
Author: s.kadam
AuthorDate: Fri Jul 19 09:55:07 2019 -0700
PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view indexes
Signed-off-by: s.kadam
---
.../phoenix/end2end/IndexScrutinyToolIT.java | 66 +-
.../org/apache/phoenix/end2end/IndexToolIT.java| 2 +-
.../end2end/ParameterizedIndexUpgradeToolIT.java | 28 -
.../apache/phoenix/end2end/index/DropColumnIT.java | 6 +-
.../org/apache/phoenix/execute/MutationState.java | 45 +--
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 21 ---
.../phoenix/query/ConnectionQueryServicesImpl.java | 13 ++---
7 files changed, 118 insertions(+), 63 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java
index cbce7b2..35bb537 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java
@@ -18,6 +18,8 @@ import static
org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -310,7 +312,13 @@ public class IndexScrutinyToolIT extends BaseTest {
Counters counters = job.getCounters();
assertEquals(1, getCounterValue(counters, VALID_ROW_COUNT));
assertEquals(1, getCounterValue(counters, INVALID_ROW_COUNT));
-assertEquals(1, getCounterValue(counters, BAD_COVERED_COL_VAL_COUNT));
+if (!this.indexTableDdl.contains("LOCAL")) {
+//As per the new design of self consistent Global indexes
PHOENIX-5156
+//We wont get any bad row.
+assumeFalse((1 == getCounterValue(counters,
BAD_COVERED_COL_VAL_COUNT)));
+} else {
+assertEquals(1, getCounterValue(counters,
BAD_COVERED_COL_VAL_COUNT));
+}
}
/**
@@ -393,7 +401,13 @@ public class IndexScrutinyToolIT extends BaseTest {
assertTrue(job.isSuccessful());
Counters counters = job.getCounters();
assertEquals(1, getCounterValue(counters, VALID_ROW_COUNT));
-assertEquals(2, getCounterValue(counters, INVALID_ROW_COUNT));
+if (!this.indexTableDdl.contains("LOCAL")) {
+//As per the new design of self consistent Global indexes
PHOENIX-5156
+//We wont get any bad row.
+assumeFalse(2 == getCounterValue(counters, INVALID_ROW_COUNT) );
+} else {
+assertEquals(2, getCounterValue(counters, INVALID_ROW_COUNT));
+}
}
/**
@@ -423,7 +437,14 @@ public class IndexScrutinyToolIT extends BaseTest {
assertTrue(job.isSuccessful());
Counters counters = job.getCounters();
assertEquals(1, getCounterValue(counters, VALID_ROW_COUNT));
-assertEquals(1, getCounterValue(counters, INVALID_ROW_COUNT));
+if (!this.indexTableDdl.contains("LOCAL")) {
+//As per the new design of self consistent Global indexes
PHOENIX-5156
+//We wont get any bad row.
+assumeFalse(1 == getCounterValue(counters, INVALID_ROW_COUNT)
);
+} else {
+assertEquals(1, getCounterValue(counters, INVALID_ROW_COUNT));
+}
+
}
}
@@ -471,11 +492,18 @@ public class IndexScrutinyToolIT extends BaseTest {
IOUtils.closeQuietly(fsDataInputStream);
}
Iterator lineIterator = lines.iterator();
-assertEquals(
-"[2, name-2, " + new Timestamp(testTime).toString() + ",
95123]\t[2, name-2, " + new Timestamp(testTime)
-.toString() + ", ]", lineIterator.next());
+if (!this.indexTableDdl.contains("LOCAL")) {
+//As per the new design of self consistent Global indexes
PHOENIX-5156
+//We wont get any bad row.
+assumeFalse(("[2, name-2, " + new Timestamp(testTime).toString() +
", 95123]\t[2, name-2, " + new Timestamp(testTime)
+.toString() + ", ]").equals(lineIterator.next()) );
+} else {
+assertEquals(
+"[2, name-2, " + new Timestamp(testTime).toStr
[phoenix] branch 4.14-HBase-1.3 updated: PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view indexes
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.3 by this push:
new 233432e PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view
indexes
233432e is described below
commit 233432e92950042622ad75d05593386a53bec420
Author: s.kadam
AuthorDate: Fri Jul 19 09:55:07 2019 -0700
PHOENIX-5385: GlobalIndexChecker coproc doesn't load on view indexes
---
.../phoenix/end2end/IndexScrutinyToolIT.java | 66 +-
.../org/apache/phoenix/end2end/IndexToolIT.java| 2 +-
.../end2end/ParameterizedIndexUpgradeToolIT.java | 28 -
.../apache/phoenix/end2end/index/DropColumnIT.java | 6 +-
.../org/apache/phoenix/execute/MutationState.java | 45 +--
.../phoenix/mapreduce/index/IndexUpgradeTool.java | 21 ---
.../phoenix/query/ConnectionQueryServicesImpl.java | 13 ++---
7 files changed, 118 insertions(+), 63 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java
index cbce7b2..35bb537 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexScrutinyToolIT.java
@@ -18,6 +18,8 @@ import static
org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -310,7 +312,13 @@ public class IndexScrutinyToolIT extends BaseTest {
Counters counters = job.getCounters();
assertEquals(1, getCounterValue(counters, VALID_ROW_COUNT));
assertEquals(1, getCounterValue(counters, INVALID_ROW_COUNT));
-assertEquals(1, getCounterValue(counters, BAD_COVERED_COL_VAL_COUNT));
+if (!this.indexTableDdl.contains("LOCAL")) {
+//As per the new design of self consistent Global indexes
PHOENIX-5156
+//We wont get any bad row.
+assumeFalse((1 == getCounterValue(counters,
BAD_COVERED_COL_VAL_COUNT)));
+} else {
+assertEquals(1, getCounterValue(counters,
BAD_COVERED_COL_VAL_COUNT));
+}
}
/**
@@ -393,7 +401,13 @@ public class IndexScrutinyToolIT extends BaseTest {
assertTrue(job.isSuccessful());
Counters counters = job.getCounters();
assertEquals(1, getCounterValue(counters, VALID_ROW_COUNT));
-assertEquals(2, getCounterValue(counters, INVALID_ROW_COUNT));
+if (!this.indexTableDdl.contains("LOCAL")) {
+//As per the new design of self consistent Global indexes
PHOENIX-5156
+//We wont get any bad row.
+assumeFalse(2 == getCounterValue(counters, INVALID_ROW_COUNT) );
+} else {
+assertEquals(2, getCounterValue(counters, INVALID_ROW_COUNT));
+}
}
/**
@@ -423,7 +437,14 @@ public class IndexScrutinyToolIT extends BaseTest {
assertTrue(job.isSuccessful());
Counters counters = job.getCounters();
assertEquals(1, getCounterValue(counters, VALID_ROW_COUNT));
-assertEquals(1, getCounterValue(counters, INVALID_ROW_COUNT));
+if (!this.indexTableDdl.contains("LOCAL")) {
+//As per the new design of self consistent Global indexes
PHOENIX-5156
+//We wont get any bad row.
+assumeFalse(1 == getCounterValue(counters, INVALID_ROW_COUNT)
);
+} else {
+assertEquals(1, getCounterValue(counters, INVALID_ROW_COUNT));
+}
+
}
}
@@ -471,11 +492,18 @@ public class IndexScrutinyToolIT extends BaseTest {
IOUtils.closeQuietly(fsDataInputStream);
}
Iterator lineIterator = lines.iterator();
-assertEquals(
-"[2, name-2, " + new Timestamp(testTime).toString() + ",
95123]\t[2, name-2, " + new Timestamp(testTime)
-.toString() + ", ]", lineIterator.next());
+if (!this.indexTableDdl.contains("LOCAL")) {
+//As per the new design of self consistent Global indexes
PHOENIX-5156
+//We wont get any bad row.
+assumeFalse(("[2, name-2, " + new Timestamp(testTime).toString() +
", 95123]\t[2, name-2, " + new Timestamp(testTime)
+.toString() + ", ]").equals(lineIterator.next()) );
+} else {
+assertEquals(
+"[2, name-2, " + new Timestamp(testTime).toString() + ",
9512
[phoenix] branch 4.14-HBase-1.4 updated: PHOENIX-5382 : Improved performace with Bulk operations over iterations
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.4 by this push:
new 2ac2cda PHOENIX-5382 : Improved performace with Bulk operations over
iterations
2ac2cda is described below
commit 2ac2cda33ca8b6d788c744584906f5f043df27c7
Author: Viraj Jasani
AuthorDate: Wed Jul 10 16:53:59 2019 +0530
PHOENIX-5382 : Improved performace with Bulk operations over iterations
Signed-off-by: s.kadam
---
.../main/java/org/apache/phoenix/compile/FromCompiler.java| 4 +++-
.../org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 5 +++--
.../main/java/org/apache/phoenix/util/CSVCommonsLoader.java | 11 ++-
.../src/main/java/org/apache/phoenix/util/Closeables.java | 5 ++---
.../src/main/java/org/apache/phoenix/util/SQLCloseables.java | 11 ++-
5 files changed, 16 insertions(+), 20 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
index 3faada7..eb4e6a8 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
@@ -694,8 +694,10 @@ public class FromCompiler {
protected PTable addDynamicColumns(List dynColumns, PTable
theTable)
throws SQLException {
if (!dynColumns.isEmpty()) {
-List allcolumns = new ArrayList();
List existingColumns = theTable.getColumns();
+List allcolumns = new ArrayList<>(
+theTable.getBucketNum() == null ? existingColumns :
+existingColumns.subList(1,
existingColumns.size()));
// Need to skip the salting column, as it's added in the
makePTable call below
allcolumns.addAll(theTable.getBucketNum() == null ?
existingColumns : existingColumns.subList(1, existingColumns.size()));
// Position still based on with the salting columns
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 1ab402e..5047991 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -3253,8 +3253,9 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
mutateTable.setInt(6, numColumns + 1);
mutateTable.execute();
}
-List tableMetadata = new ArrayList<>();
-
tableMetadata.addAll(metaConnection.getMutationState().toMutations(metaConnection.getSCN()).next().getSecond());
+List tableMetadata = new ArrayList<>(
+
metaConnection.getMutationState().toMutations(metaConnection.getSCN()).next()
+.getSecond());
metaConnection.rollback();
PColumn column = new
PColumnImpl(PNameFactory.newName("COLUMN_QUALIFIER"),
PNameFactory.newName(DEFAULT_COLUMN_FAMILY_NAME),
PVarbinary.INSTANCE, null, null, true, numColumns,
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/util/CSVCommonsLoader.java
b/phoenix-core/src/main/java/org/apache/phoenix/util/CSVCommonsLoader.java
index a5f0177..59ed9cf 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/CSVCommonsLoader.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/CSVCommonsLoader.java
@@ -158,11 +158,7 @@ public class CSVCommonsLoader {
* @return
*/
public static char asControlCharacter(char delimiter) {
-if(CTRL_CHARACTER_TABLE.containsKey(delimiter)) {
-return CTRL_CHARACTER_TABLE.get(delimiter);
-} else {
-return delimiter;
-}
+return CTRL_CHARACTER_TABLE.getOrDefault(delimiter, delimiter);
}
/**
@@ -242,10 +238,7 @@ public class CSVCommonsLoader {
System.out.println(String.format("csv columns from database."));
break;
case IN_LINE:
-columns = new ArrayList();
-for (String colName : parser.getHeaderMap().keySet()) {
-columns.add(colName); // iterates in column order
-}
+columns = new ArrayList<>(parser.getHeaderMap().keySet());
System.out.println(String.format("csv columns from header line.
length=%s, %s",
columns.size(), buildStringFromList(columns)));
break;
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/Closeables.java
b/phoenix-core/src/main/java/org/apache/phoe
[phoenix] branch 4.14-HBase-1.4 updated: PHOENIX-4918 Apache Phoenix website Grammar page is running on an old version
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.4 by this push:
new 132dde6 PHOENIX-4918 Apache Phoenix website Grammar page is running
on an old version
132dde6 is described below
commit 132dde625a1fec0f014725641923ef91a7097ddd
Author: Xinyi Yan
AuthorDate: Mon Feb 25 19:07:49 2019 -0800
PHOENIX-4918 Apache Phoenix website Grammar page is running on an old
version
Signed-off-by: s.kadam
---
docs/phoenix.csv | 1479 --
1 file changed, 1326 insertions(+), 153 deletions(-)
diff --git a/docs/phoenix.csv b/docs/phoenix.csv
index 7f5fab8..fc0c0c8 100644
--- a/docs/phoenix.csv
+++ b/docs/phoenix.csv
@@ -1,42 +1,45 @@
"SECTION","TOPIC","SYNTAX","TEXT","EXAMPLE"
"Commands","SELECT","
-SELECT [/*+ hint */] [DISTINCT | ALL] selectExpression [,...]
-FROM tableExpression [( columnDef [,...] )] [ WHERE expression ]
-[ GROUP BY expression [,...] ] [ HAVING expression ]
+selectStatement [ { UNION ALL selectStatement [...] } ]
[ ORDER BY order [,...] ] [ LIMIT {bindParameter | number} ]
+[ OFFSET {bindParameter | number} [ ROW | ROWS ] ] [ FETCH { FIRST | NEXT }
{bindParameter | number} { ROW | ROWS } ONLY ]
","
-Selects data from a table.
-DISTINCT filters out duplicate results while ALL, the default, includes all
results.
-FROM identifies the table being queried (single table only currently - no
joins or derived tables yet).
-Dynamic columns not declared at create time may be defined in parenthesis
after the table name and then
-used in the query.
-GROUP BY groups the the result by the given expression(s).
-HAVING filter rows after grouping.
-ORDER BY sorts the result by the given column(s) or expression(s) and is only
allowed for aggregate
-queries or queries with a LIMIT clause.
-LIMIT limits the number of rows returned by the query with no limit applied if
specified as null or
-less than zero. The LIMIT clause is executed after the ORDER BY clause to
support TopN type queries.
-An optional hint overrides the default query plan.
+Selects data from one or more tables.
+UNION ALL combines rows from multiple select statements.
+ORDER BY sorts the result based on the given expressions.
+LIMIT(or FETCH FIRST) limits the number of rows returned by the query with no
limit applied if unspecified or specified
+as null or less than zero. The LIMIT(or FETCH FIRST) clause is executed after
the ORDER BY clause to support top-N type
+queries.
+OFFSET clause skips that many rows before beginning to return rows.
+An optional hint may be used to override decisions made by the query optimizer.
","
-SELECT * FROM TEST;
-SELECT a.* FROM TEST;
-SELECT DISTINCT NAME FROM TEST;
-SELECT ID, COUNT(1) FROM TEST GROUP BY ID;
-SELECT NAME, SUM(VAL) FROM TEST GROUP BY NAME HAVING COUNT(1) > 2;
-SELECT 'ID' COL, MAX(ID) AS MAX FROM TEST;
SELECT * FROM TEST LIMIT 1000;
+SELECT * FROM TEST LIMIT 1000 OFFSET 100;
+SELECT full_name FROM SALES_PERSON WHERE ranking >= 5.0
+UNION ALL SELECT reviewer_name FROM CUSTOMER_REVIEW WHERE score >= 8.0
"
+
"Commands","UPSERT VALUES","
UPSERT INTO tableName [( { columnRef | columnDef } [,...] )] VALUES (
constantTerm [,...] )
+[ON DUPLICATE KEY { IGNORE | UPDATE columnRef = operand } ]
","
Inserts if not present and updates otherwise the value in the table. The list
of
columns is optional and if not present, the values will map to the column in
the
order they are declared in the schema. The values must evaluate to constants.
+Use the ON DUPLICATE KEY clause (available in Phoenix 4.9) if you need the
UPSERT to be atomic. Performance
+will be slower in this case as the row needs to be read on the server side when
+the commit is done. Use IGNORE if you do not want the UPSERT performed if the
+row already exists. Otherwise, with UPDATE, the expression will be evaluated
and the
+result used to set the column, for example to perform an atomic increment. An
UPSERT
+to the same row in the same commit batch will be processed in the order of
execution.
+
","
UPSERT INTO TEST VALUES('foo','bar',3);
UPSERT INTO TEST(NAME,ID) VALUES('foo',123);
+UPSERT INTO TEST(ID, COUNTER) VALUES(123, 0) ON DUPLICATE KEY UPDATE COUNTER =
COUNTER + 1;
+UPSERT INTO TEST(ID, MY_COL) VALUES(123, 0) ON DUPLICATE KEY IGNORE;
"
"Commands","UPSERT SELECT","
UPSERT [/*+ hint */] INTO tableName [( { columnRef | columnDef } [,...] )]
select
@@ -68,49 +71,171 @@ DELETE FROM TEST WHERE ID=123;
DELETE FROM TEST WHERE NAME LIKE 'foo%';
"
-"Commands","CREATE","
-CREATE { TABLE | VIEW } [IF NOT EXISTS] tableRef
+"Command
[phoenix] branch 4.14-HBase-1.3 updated: PHOENIX-5382 : Improved performace with Bulk operations over iterations
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.3 by this push:
new acb602f PHOENIX-5382 : Improved performace with Bulk operations over
iterations
acb602f is described below
commit acb602feedc2b638bff7eeeb0a24a3e9cdc2371b
Author: Viraj Jasani
AuthorDate: Wed Jul 10 16:53:59 2019 +0530
PHOENIX-5382 : Improved performace with Bulk operations over iterations
Signed-off-by: s.kadam
---
.../main/java/org/apache/phoenix/compile/FromCompiler.java| 4 +++-
.../org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 5 +++--
.../main/java/org/apache/phoenix/util/CSVCommonsLoader.java | 11 ++-
.../src/main/java/org/apache/phoenix/util/Closeables.java | 5 ++---
.../src/main/java/org/apache/phoenix/util/SQLCloseables.java | 11 ++-
5 files changed, 16 insertions(+), 20 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
index 3faada7..eb4e6a8 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
@@ -694,8 +694,10 @@ public class FromCompiler {
protected PTable addDynamicColumns(List dynColumns, PTable
theTable)
throws SQLException {
if (!dynColumns.isEmpty()) {
-List allcolumns = new ArrayList();
List existingColumns = theTable.getColumns();
+List allcolumns = new ArrayList<>(
+theTable.getBucketNum() == null ? existingColumns :
+existingColumns.subList(1,
existingColumns.size()));
// Need to skip the salting column, as it's added in the
makePTable call below
allcolumns.addAll(theTable.getBucketNum() == null ?
existingColumns : existingColumns.subList(1, existingColumns.size()));
// Position still based on with the salting columns
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 1ab402e..5047991 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -3253,8 +3253,9 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
mutateTable.setInt(6, numColumns + 1);
mutateTable.execute();
}
-List tableMetadata = new ArrayList<>();
-
tableMetadata.addAll(metaConnection.getMutationState().toMutations(metaConnection.getSCN()).next().getSecond());
+List tableMetadata = new ArrayList<>(
+
metaConnection.getMutationState().toMutations(metaConnection.getSCN()).next()
+.getSecond());
metaConnection.rollback();
PColumn column = new
PColumnImpl(PNameFactory.newName("COLUMN_QUALIFIER"),
PNameFactory.newName(DEFAULT_COLUMN_FAMILY_NAME),
PVarbinary.INSTANCE, null, null, true, numColumns,
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/util/CSVCommonsLoader.java
b/phoenix-core/src/main/java/org/apache/phoenix/util/CSVCommonsLoader.java
index a5f0177..59ed9cf 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/CSVCommonsLoader.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/CSVCommonsLoader.java
@@ -158,11 +158,7 @@ public class CSVCommonsLoader {
* @return
*/
public static char asControlCharacter(char delimiter) {
-if(CTRL_CHARACTER_TABLE.containsKey(delimiter)) {
-return CTRL_CHARACTER_TABLE.get(delimiter);
-} else {
-return delimiter;
-}
+return CTRL_CHARACTER_TABLE.getOrDefault(delimiter, delimiter);
}
/**
@@ -242,10 +238,7 @@ public class CSVCommonsLoader {
System.out.println(String.format("csv columns from database."));
break;
case IN_LINE:
-columns = new ArrayList();
-for (String colName : parser.getHeaderMap().keySet()) {
-columns.add(colName); // iterates in column order
-}
+columns = new ArrayList<>(parser.getHeaderMap().keySet());
System.out.println(String.format("csv columns from header line.
length=%s, %s",
columns.size(), buildStringFromList(columns)));
break;
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/Closeables.java
b/phoenix-core/src/main/java/org/apache/phoe
svn commit: r1863671 - in /phoenix: phoenix-docs/src/docsrc/help/phoenix.csv site/publish/language/index.html
Author: skadam Date: Wed Jul 24 00:54:37 2019 New Revision: 1863671 URL: http://svn.apache.org/viewvc?rev=1863671=rev Log: PHOENIX-4918: Apache Phoenix website Grammar page is running on an old version (Xinyi Yan) Modified: phoenix/phoenix-docs/src/docsrc/help/phoenix.csv phoenix/site/publish/language/index.html Modified: phoenix/phoenix-docs/src/docsrc/help/phoenix.csv URL: http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/docsrc/help/phoenix.csv?rev=1863671=1863670=1863671=diff == --- phoenix/phoenix-docs/src/docsrc/help/phoenix.csv (original) +++ phoenix/phoenix-docs/src/docsrc/help/phoenix.csv Wed Jul 24 00:54:37 2019 @@ -119,7 +119,7 @@ Column families that exist in the HBase At create time, to improve query performance, an empty key value is added to the first column family of any existing rows or the default column family if no column families are explicitly defined. Upserts will also add this empty key value. This improves query performance by having a key value column we can guarantee always being there and thus minimizing the amount of data that must be projected and subsequently returned back to the client. HBase table and column configuration options may be passed through as key/value pairs to configure the HBase table as desired. Note that when using the IF NOT EXISTS clause, if a table already exists, then no change will be made to it. Additionally, no validation is done to check whether the existing table metadata matches the proposed table metadata. so it's better to use DROP TABLE followed by CREATE TABLE is the table metadata may be changing. "," -CREATE TABLE my_schema.my_table ( id BIGINT not null primary key, date) +CREATE TABLE my_schema.my_table ( id BIGINT not null primary key, date Date) CREATE TABLE my_table ( id INTEGER not null primary key desc, date DATE not null, m.db_utilization DECIMAL, i.db_utilization) m.DATA_BLOCK_ENCODING='DIFF' Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1863671=1863670=1863671=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Wed Jul 24 00:54:37 2019 @@ -714,7 +714,7 @@ syntax-end --> Creates a new table. The HBase table and any column families referenced are created if they dont already exist. All table, column family and column names are uppercased unless they are double quoted in which case they are case sensitive. Column families that exist in the HBase table but are not listed are ignored. At create time, to improve query performance, an empty key value is added to the first column family of any existing rows or the default column family if no column families are explicitly defined. Upserts will also add this empty key value. This improves query performance by having a key value column we can guarantee always being there and thus minimizing the amount of data that must be projected and subsequently returned back to the client. HBase table and column configuration options may be passed through as key/value pairs to configure the HBase table as desired. Note that when using the IF NOT EXISTS clause, if a table already exists, then no change will be made to it. Additionally, no validation is done to check whether the existing table metadata matches the proposed table metadata. so its better to use DROP TABLE followed by CREATE TABLE is the table metadata may be changing. Example: -CREATE TABLE my_schema.my_table ( id BIGINT not null primary key, date)CREATE TABLE my_table ( id INTEGER not null primary key desc, date DATE not null,m.db_utilization DECIMAL, i.db_utilization)m.DATA_BLOCK_ENCODING=DIFFCREATE TABLE stats.prod_metrics ( host char(50) not null, created_date date not null,txn_count bigint CONSTRAINT pk PRIMARY KEY (host, created_date) )CREATE TABLE IF NOT EXISTS my_case_sensitive_table( id char(10) not null primary key, value integer)DATA_BLOCK_ENCODING=NONE,VERSIONS=5,MAX_FILESIZE=200 split on (?, ?, ?)CREATE TABLE IF NOT EXISTS my_schema.my_table (org_id CHAR(15), entity_id CHAR(15), payload binary(1000),CONSTRAINT pk PRIMARY KEY (org_id, entity_id) ) sp;TTL=86400 +CREATE TABLE my_schema.my_table ( id BIGINT not null primary key, date Date)CREATE TABLE my_table ( id INTEGER not null primary key desc, date DATE not null,m.db_utilization DECIMAL, i.db_utilization)m.DATA_BLOCK_ENCODING=DIFFCREATE TABLE stats.prod_metrics ( host char(50) not null, created_date date not null,txn_count bigint CONSTRAINT pk PRIMARY KEY (host, created_date) )CREATE TABLE IF NOT EXISTS my_case_sensitive_table( id char(10) not null primary key, value integer)DATA_BLOCK_ENCODING=NONE,VERSIONS=5,MAX_FILESIZE=200 split on (?, ?, ?)CREATE TABLE IF NOT EXISTS my_schema.my_
[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-4918 Apache Phoenix website Grammar page is running on an old version with cvs format fix (addendum)
This is an automated email from the ASF dual-hosted git repository.
skadam 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 04c38a2 PHOENIX-4918 Apache Phoenix website Grammar page is running
on an old version with cvs format fix (addendum)
04c38a2 is described below
commit 04c38a23d7d5e9613534e7303ad405996b25a579
Author: Xinyi
AuthorDate: Wed Jul 3 17:24:43 2019 -0700
PHOENIX-4918 Apache Phoenix website Grammar page is running on an old
version with cvs format fix (addendum)
Signed-off-by: s.kadam
---
docs/phoenix.csv | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/phoenix.csv b/docs/phoenix.csv
index d881e5e..fc0c0c8 100644
--- a/docs/phoenix.csv
+++ b/docs/phoenix.csv
@@ -1974,7 +1974,7 @@ similarly to the single-argument ""TO_DATE"" function.
","
TO_DATE('Sat, 3 Feb 2001 03:05:06 GMT', 'EEE, d MMM HH:mm:ss z')
TO_DATE('1970-01-01', '-MM-dd', 'GMT+1')
-date "1970-01-01 12:30:00"
+date '1970-01-01 12:30:00'
"
"Functions (Time and Date)","CURRENT_DATE","
[phoenix] branch 4.14-HBase-1.3 updated: PHOENIX-4918 Apache Phoenix website Grammar page is running on an old version
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.3 by this push:
new f29e80b PHOENIX-4918 Apache Phoenix website Grammar page is running
on an old version
f29e80b is described below
commit f29e80b28e192be0302131b8ad5a1b5976c1852d
Author: Xinyi Yan
AuthorDate: Mon Feb 25 19:07:49 2019 -0800
PHOENIX-4918 Apache Phoenix website Grammar page is running on an old
version
Signed-off-by: s.kadam
---
docs/phoenix.csv | 1479 --
1 file changed, 1326 insertions(+), 153 deletions(-)
diff --git a/docs/phoenix.csv b/docs/phoenix.csv
index 7f5fab8..fc0c0c8 100644
--- a/docs/phoenix.csv
+++ b/docs/phoenix.csv
@@ -1,42 +1,45 @@
"SECTION","TOPIC","SYNTAX","TEXT","EXAMPLE"
"Commands","SELECT","
-SELECT [/*+ hint */] [DISTINCT | ALL] selectExpression [,...]
-FROM tableExpression [( columnDef [,...] )] [ WHERE expression ]
-[ GROUP BY expression [,...] ] [ HAVING expression ]
+selectStatement [ { UNION ALL selectStatement [...] } ]
[ ORDER BY order [,...] ] [ LIMIT {bindParameter | number} ]
+[ OFFSET {bindParameter | number} [ ROW | ROWS ] ] [ FETCH { FIRST | NEXT }
{bindParameter | number} { ROW | ROWS } ONLY ]
","
-Selects data from a table.
-DISTINCT filters out duplicate results while ALL, the default, includes all
results.
-FROM identifies the table being queried (single table only currently - no
joins or derived tables yet).
-Dynamic columns not declared at create time may be defined in parenthesis
after the table name and then
-used in the query.
-GROUP BY groups the the result by the given expression(s).
-HAVING filter rows after grouping.
-ORDER BY sorts the result by the given column(s) or expression(s) and is only
allowed for aggregate
-queries or queries with a LIMIT clause.
-LIMIT limits the number of rows returned by the query with no limit applied if
specified as null or
-less than zero. The LIMIT clause is executed after the ORDER BY clause to
support TopN type queries.
-An optional hint overrides the default query plan.
+Selects data from one or more tables.
+UNION ALL combines rows from multiple select statements.
+ORDER BY sorts the result based on the given expressions.
+LIMIT(or FETCH FIRST) limits the number of rows returned by the query with no
limit applied if unspecified or specified
+as null or less than zero. The LIMIT(or FETCH FIRST) clause is executed after
the ORDER BY clause to support top-N type
+queries.
+OFFSET clause skips that many rows before beginning to return rows.
+An optional hint may be used to override decisions made by the query optimizer.
","
-SELECT * FROM TEST;
-SELECT a.* FROM TEST;
-SELECT DISTINCT NAME FROM TEST;
-SELECT ID, COUNT(1) FROM TEST GROUP BY ID;
-SELECT NAME, SUM(VAL) FROM TEST GROUP BY NAME HAVING COUNT(1) > 2;
-SELECT 'ID' COL, MAX(ID) AS MAX FROM TEST;
SELECT * FROM TEST LIMIT 1000;
+SELECT * FROM TEST LIMIT 1000 OFFSET 100;
+SELECT full_name FROM SALES_PERSON WHERE ranking >= 5.0
+UNION ALL SELECT reviewer_name FROM CUSTOMER_REVIEW WHERE score >= 8.0
"
+
"Commands","UPSERT VALUES","
UPSERT INTO tableName [( { columnRef | columnDef } [,...] )] VALUES (
constantTerm [,...] )
+[ON DUPLICATE KEY { IGNORE | UPDATE columnRef = operand } ]
","
Inserts if not present and updates otherwise the value in the table. The list
of
columns is optional and if not present, the values will map to the column in
the
order they are declared in the schema. The values must evaluate to constants.
+Use the ON DUPLICATE KEY clause (available in Phoenix 4.9) if you need the
UPSERT to be atomic. Performance
+will be slower in this case as the row needs to be read on the server side when
+the commit is done. Use IGNORE if you do not want the UPSERT performed if the
+row already exists. Otherwise, with UPDATE, the expression will be evaluated
and the
+result used to set the column, for example to perform an atomic increment. An
UPSERT
+to the same row in the same commit batch will be processed in the order of
execution.
+
","
UPSERT INTO TEST VALUES('foo','bar',3);
UPSERT INTO TEST(NAME,ID) VALUES('foo',123);
+UPSERT INTO TEST(ID, COUNTER) VALUES(123, 0) ON DUPLICATE KEY UPDATE COUNTER =
COUNTER + 1;
+UPSERT INTO TEST(ID, MY_COL) VALUES(123, 0) ON DUPLICATE KEY IGNORE;
"
"Commands","UPSERT SELECT","
UPSERT [/*+ hint */] INTO tableName [( { columnRef | columnDef } [,...] )]
select
@@ -68,49 +71,171 @@ DELETE FROM TEST WHERE ID=123;
DELETE FROM TEST WHERE NAME LIKE 'foo%';
"
-"Commands","CREATE","
-CREATE { TABLE | VIEW } [IF NOT EXISTS] tableRef
+"Command
[phoenix] branch master updated: PHOENIX-4918 Apache Phoenix website Grammar page is running on an old version with cvs format fix (addendum)
This is an automated email from the ASF dual-hosted git repository.
skadam 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 b4d4037 PHOENIX-4918 Apache Phoenix website Grammar page is running
on an old version with cvs format fix (addendum)
b4d4037 is described below
commit b4d403798eb8fdf748d8fb9c13b62bd0891317e7
Author: Xinyi
AuthorDate: Wed Jul 3 17:24:43 2019 -0700
PHOENIX-4918 Apache Phoenix website Grammar page is running on an old
version with cvs format fix (addendum)
Signed-off-by: s.kadam
---
docs/phoenix.csv | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/phoenix.csv b/docs/phoenix.csv
index d881e5e..fc0c0c8 100644
--- a/docs/phoenix.csv
+++ b/docs/phoenix.csv
@@ -1974,7 +1974,7 @@ similarly to the single-argument ""TO_DATE"" function.
","
TO_DATE('Sat, 3 Feb 2001 03:05:06 GMT', 'EEE, d MMM HH:mm:ss z')
TO_DATE('1970-01-01', '-MM-dd', 'GMT+1')
-date "1970-01-01 12:30:00"
+date '1970-01-01 12:30:00'
"
"Functions (Time and Date)","CURRENT_DATE","
[phoenix] branch 4.x-HBase-1.5 updated: PHOENIX-4918 Apache Phoenix website Grammar page is running on an old version with cvs format fix (addendum)
This is an automated email from the ASF dual-hosted git repository.
skadam 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 f2c2fd1 PHOENIX-4918 Apache Phoenix website Grammar page is running
on an old version with cvs format fix (addendum)
f2c2fd1 is described below
commit f2c2fd117070cebd78e3b1acb5df9cfd4b81999a
Author: Xinyi
AuthorDate: Wed Jul 3 17:24:43 2019 -0700
PHOENIX-4918 Apache Phoenix website Grammar page is running on an old
version with cvs format fix (addendum)
Signed-off-by: s.kadam
---
docs/phoenix.csv | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/phoenix.csv b/docs/phoenix.csv
index d881e5e..fc0c0c8 100644
--- a/docs/phoenix.csv
+++ b/docs/phoenix.csv
@@ -1974,7 +1974,7 @@ similarly to the single-argument ""TO_DATE"" function.
","
TO_DATE('Sat, 3 Feb 2001 03:05:06 GMT', 'EEE, d MMM HH:mm:ss z')
TO_DATE('1970-01-01', '-MM-dd', 'GMT+1')
-date "1970-01-01 12:30:00"
+date '1970-01-01 12:30:00'
"
"Functions (Time and Date)","CURRENT_DATE","
[phoenix] branch 4.14-HBase-1.3 updated: PHOENIX-5209 Cannot add non-PK column to table when the last PK column is of type VARBINARY or ARRAY
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.3 by this push:
new 94a7d29 PHOENIX-5209 Cannot add non-PK column to table when the last
PK column is of type VARBINARY or ARRAY
94a7d29 is described below
commit 94a7d29d6f9feef170ba116c5d1d475f6fe4f0ac
Author: Toshihiro Suzuki
AuthorDate: Sun Jul 14 11:38:58 2019 +0900
PHOENIX-5209 Cannot add non-PK column to table when the last PK column is
of type VARBINARY or ARRAY
Signed-off-by: s.kadam
---
.../org/apache/phoenix/end2end/AlterTableIT.java | 26 +-
.../org/apache/phoenix/schema/MetaDataClient.java | 17 ++
2 files changed, 38 insertions(+), 5 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index b1949ed..2585d17 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -1345,6 +1345,30 @@ public class AlterTableIT extends
ParallelStatsDisabledIT {
assertFalse(rs.next());
}
}
-
+
+@Test
+public void testAddNonPKColumnWhenlastPKIsVARBINARYOrARRAY() throws
Exception {
+String tableName1 = generateUniqueName();
+String tableName2 = generateUniqueName();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+try (Connection conn = DriverManager.getConnection(getUrl(), props);
+ Statement stmt = conn.createStatement()) {
+conn.setAutoCommit(false);
+
+String ddl = "CREATE TABLE " + tableName1 + " (id VARBINARY
PRIMARY KEY, "
+ + "col1 INTEGER)";
+stmt.execute(ddl);
+
+String alterDdl = "ALTER TABLE " + tableName1 + " ADD col2
INTEGER";
+stmt.execute(alterDdl);
+
+String ddl2 = "CREATE TABLE " + tableName2 + " (id INTEGER ARRAY
PRIMARY KEY, "
+ + "col1 INTEGER)";
+stmt.execute(ddl2);
+
+String alterDdl2 = "ALTER TABLE " + tableName2 + " ADD col2
INTEGER";
+stmt.execute(alterDdl2);
+}
+}
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 48bbf67..3dead42 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -3295,15 +3295,24 @@ public class MetaDataClient {
int position = table.getColumns().size();
-List currentPKs = table.getPKColumns();
-if (numCols > 0) {
+boolean addPKColumns = false;
+for (ColumnDef columnDef : columnDefs) {
+if (columnDef.isPK()) {
+addPKColumns = true;
+break;
+}
+}
+if (addPKColumns) {
+List currentPKs = table.getPKColumns();
PColumn lastPK = currentPKs.get(currentPKs.size()-1);
-// Disallow adding columns if the last column is VARBIANRY.
+// Disallow adding columns if the last column in the
primary key is VARBIANRY
+// or ARRAY.
if (lastPK.getDataType() == PVarbinary.INSTANCE ||
lastPK.getDataType().isArrayType()) {
throw new
SQLExceptionInfo.Builder(SQLExceptionCode.VARBINARY_LAST_PK)
.setColumnName(lastPK.getName().getString()).build().buildException();
}
-// Disallow adding columns if last column is fixed width
and nullable.
+// Disallow adding columns if last column in the primary
key is fixed width
+// and nullable.
if (lastPK.isNullable() &&
lastPK.getDataType().isFixedWidth()) {
throw new
SQLExceptionInfo.Builder(SQLExceptionCode.NULLABLE_FIXED_WIDTH_LAST_PK)
.setColumnName(lastPK.getName().getString()).build().buildException();
[phoenix] branch 4.14-HBase-1.4 updated: PHOENIX-5209 Cannot add non-PK column to table when the last PK column is of type VARBINARY or ARRAY
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.4 by this push:
new ddd2c5d PHOENIX-5209 Cannot add non-PK column to table when the last
PK column is of type VARBINARY or ARRAY
ddd2c5d is described below
commit ddd2c5dc4df6b88de567ad771c6096536813a2cb
Author: Toshihiro Suzuki
AuthorDate: Sun Jul 14 11:38:58 2019 +0900
PHOENIX-5209 Cannot add non-PK column to table when the last PK column is
of type VARBINARY or ARRAY
Signed-off-by: s.kadam
---
.../org/apache/phoenix/end2end/AlterTableIT.java | 26 +-
.../org/apache/phoenix/schema/MetaDataClient.java | 17 ++
2 files changed, 38 insertions(+), 5 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index b1949ed..2585d17 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -1345,6 +1345,30 @@ public class AlterTableIT extends
ParallelStatsDisabledIT {
assertFalse(rs.next());
}
}
-
+
+@Test
+public void testAddNonPKColumnWhenlastPKIsVARBINARYOrARRAY() throws
Exception {
+String tableName1 = generateUniqueName();
+String tableName2 = generateUniqueName();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+try (Connection conn = DriverManager.getConnection(getUrl(), props);
+ Statement stmt = conn.createStatement()) {
+conn.setAutoCommit(false);
+
+String ddl = "CREATE TABLE " + tableName1 + " (id VARBINARY
PRIMARY KEY, "
+ + "col1 INTEGER)";
+stmt.execute(ddl);
+
+String alterDdl = "ALTER TABLE " + tableName1 + " ADD col2
INTEGER";
+stmt.execute(alterDdl);
+
+String ddl2 = "CREATE TABLE " + tableName2 + " (id INTEGER ARRAY
PRIMARY KEY, "
+ + "col1 INTEGER)";
+stmt.execute(ddl2);
+
+String alterDdl2 = "ALTER TABLE " + tableName2 + " ADD col2
INTEGER";
+stmt.execute(alterDdl2);
+}
+}
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 48bbf67..3dead42 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -3295,15 +3295,24 @@ public class MetaDataClient {
int position = table.getColumns().size();
-List currentPKs = table.getPKColumns();
-if (numCols > 0) {
+boolean addPKColumns = false;
+for (ColumnDef columnDef : columnDefs) {
+if (columnDef.isPK()) {
+addPKColumns = true;
+break;
+}
+}
+if (addPKColumns) {
+List currentPKs = table.getPKColumns();
PColumn lastPK = currentPKs.get(currentPKs.size()-1);
-// Disallow adding columns if the last column is VARBIANRY.
+// Disallow adding columns if the last column in the
primary key is VARBIANRY
+// or ARRAY.
if (lastPK.getDataType() == PVarbinary.INSTANCE ||
lastPK.getDataType().isArrayType()) {
throw new
SQLExceptionInfo.Builder(SQLExceptionCode.VARBINARY_LAST_PK)
.setColumnName(lastPK.getName().getString()).build().buildException();
}
-// Disallow adding columns if last column is fixed width
and nullable.
+// Disallow adding columns if last column in the primary
key is fixed width
+// and nullable.
if (lastPK.isNullable() &&
lastPK.getDataType().isFixedWidth()) {
throw new
SQLExceptionInfo.Builder(SQLExceptionCode.NULLABLE_FIXED_WIDTH_LAST_PK)
.setColumnName(lastPK.getName().getString()).build().buildException();
[phoenix] branch 4.14-HBase-1.4 updated: PHOENIX-5382 : Improved performace with Bulk operations over iterations (addendum)
This is an automated email from the ASF dual-hosted git repository.
skadam pushed a commit to branch 4.14-HBase-1.4
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.14-HBase-1.4 by this push:
new 4967d01 PHOENIX-5382 : Improved performace with Bulk operations over
iterations (addendum)
4967d01 is described below
commit 4967d0142fc4cf440993e10bebaf868f7fb99d4d
Author: Viraj Jasani
AuthorDate: Wed Jul 24 17:03:34 2019 +0530
PHOENIX-5382 : Improved performace with Bulk operations over iterations
(addendum)
Signed-off-by: s.kadam
---
.../src/main/java/org/apache/phoenix/compile/FromCompiler.java | 3 +--
.../java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 5 ++---
.../src/main/java/org/apache/phoenix/util/CSVCommonsLoader.java | 6 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
index eb4e6a8..dab0ef1 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
@@ -695,11 +695,10 @@ public class FromCompiler {
throws SQLException {
if (!dynColumns.isEmpty()) {
List existingColumns = theTable.getColumns();
+// Need to skip the salting column, as it's added in the
makePTable call below
List allcolumns = new ArrayList<>(
theTable.getBucketNum() == null ? existingColumns :
existingColumns.subList(1,
existingColumns.size()));
-// Need to skip the salting column, as it's added in the
makePTable call below
-allcolumns.addAll(theTable.getBucketNum() == null ?
existingColumns : existingColumns.subList(1, existingColumns.size()));
// Position still based on with the salting columns
int position = existingColumns.size();
PName defaultFamilyName =
PNameFactory.newName(SchemaUtil.getEmptyColumnFamily(theTable));
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 5047991..1ab402e 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -3253,9 +3253,8 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
mutateTable.setInt(6, numColumns + 1);
mutateTable.execute();
}
-List tableMetadata = new ArrayList<>(
-
metaConnection.getMutationState().toMutations(metaConnection.getSCN()).next()
-.getSecond());
+List tableMetadata = new ArrayList<>();
+
tableMetadata.addAll(metaConnection.getMutationState().toMutations(metaConnection.getSCN()).next().getSecond());
metaConnection.rollback();
PColumn column = new
PColumnImpl(PNameFactory.newName("COLUMN_QUALIFIER"),
PNameFactory.newName(DEFAULT_COLUMN_FAMILY_NAME),
PVarbinary.INSTANCE, null, null, true, numColumns,
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/util/CSVCommonsLoader.java
b/phoenix-core/src/main/java/org/apache/phoenix/util/CSVCommonsLoader.java
index 59ed9cf..024e3cd 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/CSVCommonsLoader.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/CSVCommonsLoader.java
@@ -158,7 +158,11 @@ public class CSVCommonsLoader {
* @return
*/
public static char asControlCharacter(char delimiter) {
-return CTRL_CHARACTER_TABLE.getOrDefault(delimiter, delimiter);
+if(CTRL_CHARACTER_TABLE.containsKey(delimiter)) {
+return CTRL_CHARACTER_TABLE.get(delimiter);
+} else {
+return delimiter;
+}
}
/**
[phoenix] branch 4.x-HBase-1.4 updated (2a670b0 -> b962034)
This is an automated email from the ASF dual-hosted git repository. skadam pushed a change to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git. from 2a670b0 PHOENIX-5360 Cleanup anonymous inner classes in WhereOptimizer new 99b3b9f PHOENIX-4918 Apache Phoenix website Grammar page is running on an old version with cvs format fix (addendum) new b962034 PHOENIX-5382 : Improved performace with Bulk operations over iterations (addendum) 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: docs/phoenix.csv| 2 +- .../src/main/java/org/apache/phoenix/util/CSVCommonsLoader.java | 6 +- 2 files changed, 6 insertions(+), 2 deletions(-)
