[phoenix] branch master updated: PHOENIX-6843 Flakey ViewTTLIT
This is an automated email from the ASF dual-hosted git repository.
stoty 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 4ea742ceb7 PHOENIX-6843 Flakey ViewTTLIT
4ea742ceb7 is described below
commit 4ea742ceb7c6c2e4d7d31de1fc317c687a100801
Author: Istvan Toth
AuthorDate: Fri Dec 2 11:08:39 2022 +0100
PHOENIX-6843 Flakey ViewTTLIT
---
phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLIT.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLIT.java
index 690d4cd6fb..ea2d945ab3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLIT.java
@@ -2377,7 +2377,7 @@ public class ViewTTLIT extends ParallelStatsDisabledIT {
// Verify before TTL expiration
Properties props = new Properties();
-long scnTimestamp = EnvironmentEdgeManager.currentTimeMillis();
+long scnTimestamp = EnvironmentEdgeManager.currentTimeMillis() + 1;
props.setProperty("CurrentSCN", Long.toString(scnTimestamp));
props.setProperty(QueryServices.COLLECT_REQUEST_LEVEL_METRICS,
String.valueOf(true));
try (Connection readConnection =
DriverManager.getConnection(tenantConnectUrl, props)) {
@@ -2414,7 +2414,7 @@ public class ViewTTLIT extends ParallelStatsDisabledIT {
.getTenantId();
// Verify rows exists (not masked) at current time
-long scnTimestamp = EnvironmentEdgeManager.currentTimeMillis();
+long scnTimestamp = EnvironmentEdgeManager.currentTimeMillis() + 1;
Properties props = new Properties();
props.setProperty("CurrentSCN", Long.toString(scnTimestamp ));
try (Connection readConnection =
DriverManager.getConnection(tenantConnectUrl, props)) {
[phoenix] branch master updated: PHOENIX-6840 Very flakey ParallelPhoenixConnectionFailureTest
This is an automated email from the ASF dual-hosted git repository.
stoty 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 7dd33bdb5a PHOENIX-6840 Very flakey
ParallelPhoenixConnectionFailureTest
7dd33bdb5a is described below
commit 7dd33bdb5a7b800d4385bb10784191caf0f908fa
Author: Istvan Toth
AuthorDate: Mon Nov 28 14:49:28 2022 +0100
PHOENIX-6840 Very flakey ParallelPhoenixConnectionFailureTest
---
.../jdbc/ParallelPhoenixConnectionFailureTest.java | 34 ++
1 file changed, 3 insertions(+), 31 deletions(-)
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/ParallelPhoenixConnectionFailureTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/ParallelPhoenixConnectionFailureTest.java
index eaa78bbf54..ed74645d70 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/ParallelPhoenixConnectionFailureTest.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/ParallelPhoenixConnectionFailureTest.java
@@ -19,65 +19,37 @@ package org.apache.phoenix.jdbc;
import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL;
import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR;
-import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL_TERMINATOR;
-import static
org.apache.phoenix.util.PhoenixRuntime.PHOENIX_TEST_DRIVER_URL_PARAM;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
-import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.Map;
import java.util.Properties;
import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.ReadOnlyProps;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
-import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-
/**
* Test to make sure once an error is encountered on an underlying phoenix
connection
* we don't use that connection during the entire lifecycle of client
conenction
*/
-@Category(NeedsOwnMiniClusterTest.class)
public class ParallelPhoenixConnectionFailureTest extends BaseTest {
private static String url =
-JDBC_PROTOCOL + JDBC_PROTOCOL_SEPARATOR +
PhoenixRuntime.CONNECTIONLESS
-+ JDBC_PROTOCOL_SEPARATOR +
HConstants.DEFAULT_ZOOKEPER_CLIENT_PORT
-+ JDBC_PROTOCOL_TERMINATOR +
PHOENIX_TEST_DRIVER_URL_PARAM;;
-private static PhoenixTestDriver driver;
-private static HBaseTestingUtility hbaseTestingUtility;
-
-@BeforeClass
-public static void setupBeforeClass() throws Exception {
-Map props = Maps.newHashMapWithExpectedSize(1);
-driver = initAndRegisterTestDriver(url, new ReadOnlyProps(props));
-hbaseTestingUtility = new HBaseTestingUtility();
-}
-
-@AfterClass
-public static void tearDownAfterClass() {
-destroyDriver(driver);
-}
+JDBC_PROTOCOL + JDBC_PROTOCOL_SEPARATOR +
PhoenixRuntime.CONNECTIONLESS;
@Test
public void testExecuteQueryChainFailure() throws SQLException {
+HBaseTestingUtility hbaseTestingUtility = new HBaseTestingUtility();
+
PhoenixConnection conn1 = (PhoenixConnection)
DriverManager.getConnection(url);
PhoenixConnection conn2 = (PhoenixConnection)
DriverManager.getConnection(url);
PhoenixConnection connSpy1 = Mockito.spy(conn1);
[phoenix] branch 5.1 updated: PHOENIX-6841 Depend on omid-codahale-metrics
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new bb60540397 PHOENIX-6841 Depend on omid-codahale-metrics
bb60540397 is described below
commit bb605403978608aac482bb02357b9443cb120f06
Author: Istvan Toth
AuthorDate: Thu Dec 1 13:38:08 2022 +0100
PHOENIX-6841 Depend on omid-codahale-metrics
---
phoenix-core/pom.xml | 4
pom.xml | 18 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index c8f7a18f30..bb23d93f0c 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -411,6 +411,10 @@
org.apache.omid
omid-common
+
+ org.apache.omid
+ omid-codahale-metrics
+
diff --git a/pom.xml b/pom.xml
index 89548d9da5..80077ec6f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,16 +365,7 @@
- org.apache.omid:omid-hbase-shims-hbase2.x
-
-
- org.apache.omid:omid-hbase-common-hbase2.x:jar
-
-
- org.apache.omid:omid-hbase-commit-table-hbase2.x
-
-
- org.apache.omid:omid-timestamp-storage-hbase2.x
+ org.apache.omid:*
org.slf4j:slf4j-reload4j
@@ -1305,6 +1296,12 @@
+
+org.apache.omid
+omid-codahale-metrics
+${omid.version}
+
+
org.apache.curator
curator-framework
@@ -1321,7 +1318,6 @@
${curator.version}
-
org.apache.hbase
hbase-testing-util
[phoenix] branch master updated: PHOENIX-6841 Depend on omid-codahale-metrics
This is an automated email from the ASF dual-hosted git repository.
stoty 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 9808404926 PHOENIX-6841 Depend on omid-codahale-metrics
9808404926 is described below
commit 9808404926bcc28411e0d97fce656127492bc2b4
Author: Istvan Toth
AuthorDate: Thu Dec 1 13:38:08 2022 +0100
PHOENIX-6841 Depend on omid-codahale-metrics
---
phoenix-core/pom.xml | 4
pom.xml | 7 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index f1079105d3..507629ac73 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -444,6 +444,10 @@
org.apache.omid
omid-common
+
+ org.apache.omid
+ omid-codahale-metrics
+
diff --git a/pom.xml b/pom.xml
index ef99d0de18..b6c939bbca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1270,6 +1270,12 @@
+
+org.apache.omid
+omid-codahale-metrics
+${omid.version}
+
+
org.apache.curator
curator-framework
@@ -1286,7 +1292,6 @@
${curator.version}
-
org.apache.hbase
hbase-testing-util
[phoenix] branch 5.1 updated: PHOENIX-6834 Use Pooled HConnection for Server Side Upsert Select (addendum:fix backport)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new 848978dca8 PHOENIX-6834 Use Pooled HConnection for Server Side Upsert Select (addendum:fix backport) 848978dca8 is described below commit 848978dca841d71e03707418262bb1f60835382b Author: Istvan Toth AuthorDate: Tue Nov 29 07:17:14 2022 +0100 PHOENIX-6834 Use Pooled HConnection for Server Side Upsert Select (addendum:fix backport) --- .../org/apache/phoenix/coprocessor/UngroupedAggregateRegionScanner.java | 1 + 1 file changed, 1 insertion(+) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionScanner.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionScanner.java index b7eb82c297..ccf435e5f7 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionScanner.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionScanner.java @@ -103,6 +103,7 @@ import org.apache.phoenix.schema.types.PDouble; import org.apache.phoenix.schema.types.PFloat; import org.apache.phoenix.thirdparty.com.google.common.collect.Sets; import org.apache.phoenix.thirdparty.com.google.common.primitives.Ints; +import org.apache.phoenix.transaction.PhoenixTransactionContext; import org.apache.phoenix.transaction.PhoenixTransactionProvider; import org.apache.phoenix.transaction.TransactionFactory; import org.apache.phoenix.util.ByteUtil;
[phoenix] branch 5.1 updated: PHOENIX-6834 Use Pooled HConnection for Server Side Upsert Select
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new 3a0c3710dc PHOENIX-6834 Use Pooled HConnection for Server Side Upsert Select 3a0c3710dc is described below commit 3a0c3710dc0ced14d2ace08082951367c08a6728 Author: Istvan Toth AuthorDate: Wed Nov 23 17:31:07 2022 +0100 PHOENIX-6834 Use Pooled HConnection for Server Side Upsert Select --- .../UngroupedAggregateRegionScanner.java | 41 +++--- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionScanner.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionScanner.java index ec203125c6..b7eb82c297 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionScanner.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionScanner.java @@ -34,9 +34,9 @@ import static org.apache.phoenix.query.QueryServices.MUTATE_BATCH_SIZE_ATTRIB; import static org.apache.phoenix.query.QueryServices.MUTATE_BATCH_SIZE_BYTES_ATTRIB; import static org.apache.phoenix.query.QueryServices.SOURCE_OPERATION_ATTRIB; import static org.apache.phoenix.schema.PTableImpl.getColumnsToClone; -import static org.apache.phoenix.util.WALAnnotationUtil.annotateMutation; import static org.apache.phoenix.util.ScanUtil.getPageSizeMsForRegionScanner; import static org.apache.phoenix.util.ScanUtil.isDummy; +import static org.apache.phoenix.util.WALAnnotationUtil.annotateMutation; import java.io.IOException; import java.sql.SQLException; @@ -45,18 +45,12 @@ import java.util.Arrays; import java.util.List; import java.util.Set; -import org.apache.phoenix.thirdparty.com.google.common.collect.Sets; -import org.apache.phoenix.thirdparty.com.google.common.primitives.Ints; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellBuilderFactory; import org.apache.hadoop.hbase.CellBuilderType; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.DoNotRetryIOException; -import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.Connection; -import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.Put; @@ -69,6 +63,7 @@ import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.regionserver.Region; import org.apache.hadoop.hbase.regionserver.RegionScanner; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.util.Pair; import org.apache.phoenix.cache.GlobalCache; import org.apache.phoenix.cache.TenantCache; import org.apache.phoenix.exception.DataExceedsCapacityException; @@ -77,9 +72,13 @@ import org.apache.phoenix.expression.Expression; import org.apache.phoenix.expression.aggregator.Aggregator; import org.apache.phoenix.expression.aggregator.Aggregators; import org.apache.phoenix.expression.aggregator.ServerAggregators; +import org.apache.phoenix.hbase.index.ValueGetter; import org.apache.phoenix.hbase.index.covered.update.ColumnReference; import org.apache.phoenix.hbase.index.util.GenericKeyValueBuilder; +import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; +import org.apache.phoenix.index.IndexMaintainer; import org.apache.phoenix.index.PhoenixIndexCodec; +import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.memory.InsufficientMemoryException; import org.apache.phoenix.memory.MemoryManager; import org.apache.phoenix.query.QueryConstants; @@ -102,20 +101,18 @@ import org.apache.phoenix.schema.types.PChar; import org.apache.phoenix.schema.types.PDataType; import org.apache.phoenix.schema.types.PDouble; import org.apache.phoenix.schema.types.PFloat; -import org.apache.phoenix.transaction.PhoenixTransactionContext; +import org.apache.phoenix.thirdparty.com.google.common.collect.Sets; +import org.apache.phoenix.thirdparty.com.google.common.primitives.Ints; import org.apache.phoenix.transaction.PhoenixTransactionProvider; import org.apache.phoenix.transaction.TransactionFactory; import org.apache.phoenix.util.ByteUtil; import org.apache.phoenix.util.EncodedColumnsUtil; -import org.apache.hadoop.hbase.util.Pair; -import org.apache.phoenix.hbase.index.ValueGetter; -import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; -import org.apache.phoenix.index.IndexMaintainer; import org.apache.phoenix.util.EnvironmentEdgeManager; import org.apache.phoenix.util.ExpressionUtil; import org.apache.phoenix.util.IndexUtil; import org.apache.phoenix.util.LogUtil; import org.apache.phoenix.util.PhoenixKeyValueUtil; +import
[phoenix] branch master updated: PHOENIX-6834 Use Pooled HConnection for Server Side Upsert Select
This is an automated email from the ASF dual-hosted git repository. stoty 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 5cb18429c7 PHOENIX-6834 Use Pooled HConnection for Server Side Upsert Select 5cb18429c7 is described below commit 5cb18429c770d734bf4452c40f0ce1cf70719210 Author: Istvan Toth AuthorDate: Wed Nov 23 17:31:07 2022 +0100 PHOENIX-6834 Use Pooled HConnection for Server Side Upsert Select --- .../UngroupedAggregateRegionScanner.java | 41 +++--- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionScanner.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionScanner.java index e8ec6d758e..bd0bb1e054 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionScanner.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionScanner.java @@ -34,9 +34,9 @@ import static org.apache.phoenix.query.QueryServices.MUTATE_BATCH_SIZE_ATTRIB; import static org.apache.phoenix.query.QueryServices.MUTATE_BATCH_SIZE_BYTES_ATTRIB; import static org.apache.phoenix.query.QueryServices.SOURCE_OPERATION_ATTRIB; import static org.apache.phoenix.schema.PTableImpl.getColumnsToClone; -import static org.apache.phoenix.util.WALAnnotationUtil.annotateMutation; import static org.apache.phoenix.util.ScanUtil.getPageSizeMsForRegionScanner; import static org.apache.phoenix.util.ScanUtil.isDummy; +import static org.apache.phoenix.util.WALAnnotationUtil.annotateMutation; import java.io.IOException; import java.sql.SQLException; @@ -45,18 +45,12 @@ import java.util.Arrays; import java.util.List; import java.util.Set; -import org.apache.phoenix.thirdparty.com.google.common.collect.Sets; -import org.apache.phoenix.thirdparty.com.google.common.primitives.Ints; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellBuilderFactory; import org.apache.hadoop.hbase.CellBuilderType; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.DoNotRetryIOException; -import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.Connection; -import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.Put; @@ -69,6 +63,7 @@ import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.regionserver.Region; import org.apache.hadoop.hbase.regionserver.RegionScanner; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.util.Pair; import org.apache.phoenix.cache.GlobalCache; import org.apache.phoenix.cache.TenantCache; import org.apache.phoenix.exception.DataExceedsCapacityException; @@ -77,9 +72,13 @@ import org.apache.phoenix.expression.Expression; import org.apache.phoenix.expression.aggregator.Aggregator; import org.apache.phoenix.expression.aggregator.Aggregators; import org.apache.phoenix.expression.aggregator.ServerAggregators; +import org.apache.phoenix.hbase.index.ValueGetter; import org.apache.phoenix.hbase.index.covered.update.ColumnReference; import org.apache.phoenix.hbase.index.util.GenericKeyValueBuilder; +import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; +import org.apache.phoenix.index.IndexMaintainer; import org.apache.phoenix.index.PhoenixIndexCodec; +import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.memory.InsufficientMemoryException; import org.apache.phoenix.memory.MemoryManager; import org.apache.phoenix.query.QueryConstants; @@ -102,20 +101,18 @@ import org.apache.phoenix.schema.types.PChar; import org.apache.phoenix.schema.types.PDataType; import org.apache.phoenix.schema.types.PDouble; import org.apache.phoenix.schema.types.PFloat; -import org.apache.phoenix.transaction.PhoenixTransactionContext; +import org.apache.phoenix.thirdparty.com.google.common.collect.Sets; +import org.apache.phoenix.thirdparty.com.google.common.primitives.Ints; import org.apache.phoenix.transaction.PhoenixTransactionProvider; import org.apache.phoenix.transaction.TransactionFactory; import org.apache.phoenix.util.ByteUtil; import org.apache.phoenix.util.EncodedColumnsUtil; -import org.apache.hadoop.hbase.util.Pair; -import org.apache.phoenix.hbase.index.ValueGetter; -import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; -import org.apache.phoenix.index.IndexMaintainer; import org.apache.phoenix.util.EnvironmentEdgeManager; import org.apache.phoenix.util.ExpressionUtil; import org.apache.phoenix.util.IndexUtil; import org.apache.phoenix.util.LogUtil; import org.apache.phoenix.util.PhoenixKeyValueUtil; +import
[phoenix] branch 5.1 updated: PHOENIX-6835 Flakey RowTimestampIT.testAutomaticallySettingRowTimestampWithDate
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new 713f6db406 PHOENIX-6835 Flakey
RowTimestampIT.testAutomaticallySettingRowTimestampWithDate
713f6db406 is described below
commit 713f6db40603899f2717a43dca005c6b2e3ca3c5
Author: Istvan Toth
AuthorDate: Thu Nov 24 08:49:30 2022 +0100
PHOENIX-6835 Flakey
RowTimestampIT.testAutomaticallySettingRowTimestampWithDate
---
phoenix-core/src/it/java/org/apache/phoenix/end2end/RowTimestampIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowTimestampIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowTimestampIT.java
index b9b0eb4503..4795f16c01 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowTimestampIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowTimestampIT.java
@@ -260,7 +260,7 @@ public class RowTimestampIT extends ParallelStatsDisabledIT
{
// the data in this query.
PreparedStatement stmt =
conn.prepareStatement("SELECT KV1, KV2, PK2 FROM " +
tableName
-+ " WHERE PK1 = ? AND PK2 > ? AND PK2 < ? ");
++ " WHERE PK1 = ? AND PK2 >= ? AND PK2 <= ? ");
stmt.setString(1, "PK1");
stmt.setDate(2, new Date(startTime));
stmt.setDate(3, new Date(endTime));
[phoenix] branch master updated: PHOENIX-6835 Flakey RowTimestampIT.testAutomaticallySettingRowTimestampWithDate
This is an automated email from the ASF dual-hosted git repository.
stoty 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 1f41375259 PHOENIX-6835 Flakey
RowTimestampIT.testAutomaticallySettingRowTimestampWithDate
1f41375259 is described below
commit 1f41375259c3b40b4c9f38d693234610cfdd19f2
Author: Istvan Toth
AuthorDate: Thu Nov 24 08:49:30 2022 +0100
PHOENIX-6835 Flakey
RowTimestampIT.testAutomaticallySettingRowTimestampWithDate
---
phoenix-core/src/it/java/org/apache/phoenix/end2end/RowTimestampIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowTimestampIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowTimestampIT.java
index b9b0eb4503..4795f16c01 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowTimestampIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowTimestampIT.java
@@ -260,7 +260,7 @@ public class RowTimestampIT extends ParallelStatsDisabledIT
{
// the data in this query.
PreparedStatement stmt =
conn.prepareStatement("SELECT KV1, KV2, PK2 FROM " +
tableName
-+ " WHERE PK1 = ? AND PK2 > ? AND PK2 < ? ");
++ " WHERE PK1 = ? AND PK2 >= ? AND PK2 <= ? ");
stmt.setString(1, "PK1");
stmt.setDate(2, new Date(startTime));
stmt.setDate(3, new Date(endTime));
[phoenix] branch 5.1 updated: PHOENIX-6818 Remove dependency on the i18n-util library
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new 35a8b52d7a PHOENIX-6818 Remove dependency on the i18n-util library 35a8b52d7a is described below commit 35a8b52d7a86d090ef514857382359875ca2cf5b Author: Mate Szalay-Beko AuthorDate: Thu Nov 10 16:11:49 2022 +0100 PHOENIX-6818 Remove dependency on the i18n-util library i18n-util is not maintained anymore, but uses icu4j dependencies having CVE issues. To avoid these problems, I copied the relevant code from i18n-util and used the latest icu4j version. --- dev/release_files/LICENSE |2 +- phoenix-core/pom.xml |8 +- .../expression/function/CollationKeyFunction.java | 12 +- .../phoenix/expression/function/LowerFunction.java |3 +- .../phoenix/expression/function/UpperFunction.java | 21 +- .../apache/phoenix/util/DeferredStringBuilder.java | 135 +++ .../apache/phoenix/util/i18n/LinguisticSort.java | 1172 .../org/apache/phoenix/util/i18n/LocaleUtils.java | 86 ++ .../org/apache/phoenix/util/i18n/OracleUpper.java | 82 ++ .../apache/phoenix/util/i18n/OracleUpperTable.java | 337 ++ .../org/apache/phoenix/util/i18n/package-info.java | 27 + .../phoenix/util/i18n/LinguisticSortTest.java | 650 +++ .../util/i18n/OracleUpperTableGeneratorTest.java | 391 +++ pom.xml| 13 +- 14 files changed, 2912 insertions(+), 27 deletions(-) diff --git a/dev/release_files/LICENSE b/dev/release_files/LICENSE index 4577518c7a..c3c68268f8 100644 --- a/dev/release_files/LICENSE +++ b/dev/release_files/LICENSE @@ -254,7 +254,7 @@ Janino Compiler (https://github.com/janino-compiler/janino) Hamcrest-core 1.3 (http://www.hamcrest.org) Copyright (c) 2000-2006, www.hamcrest.org -i18n-util 1.0.1 (https://github.com/salesforce/i18n-util) Copyright (c) 2017, Salesforce.com, Inc. All rights reserved. +icu4j (https://github.com/unicode-org/icu) Copyright (c) 2016 and later Unicode, Inc. and others. All Rights Reserved. --- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 5369b2b0e5..c8f7a18f30 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -516,8 +516,12 @@ stream - com.salesforce.i18n - i18n-util + com.ibm.icu + icu4j + + + com.ibm.icu + icu4j-localespi com.lmax diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/CollationKeyFunction.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/CollationKeyFunction.java index f5cbdc4557..676b6460df 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/CollationKeyFunction.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/CollationKeyFunction.java @@ -35,11 +35,11 @@ import org.apache.phoenix.schema.types.PInteger; import org.apache.phoenix.schema.types.PVarbinary; import org.apache.phoenix.schema.types.PVarchar; import org.apache.phoenix.util.VarBinaryFormatter; +import org.apache.phoenix.util.i18n.LinguisticSort; +import org.apache.phoenix.util.i18n.LocaleUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.force.db.i18n.LinguisticSort; -import com.force.i18n.LocaleUtils; /** * A Phoenix Function that calculates a collation key for an input string based @@ -51,10 +51,12 @@ import com.force.i18n.LocaleUtils; * are all valid locale representations. Note the language code, country code * and variant are used as arguments to the constructor of java.util.Locale. * - * This function uses the open-source i18n-util package to obtain the collators - * it needs from the provided locale. + * This function originally used the open-source i18n-util package to obtain the + * collators it needs from the provided locale. As i18n-util is not maintained + * anymore, the relevant parts from it were copied into Phoenix. + * See: https://issues.apache.org/jira/browse/PHOENIX-6818 * - * The LinguisticSort implementation in i18n-util encapsulates sort-related + * The LinguisticSort implementation from i18n-util encapsulates sort-related * functionality for a substantive list of locales. For each locale, it provides * a collator and an Oracle-specific database function that can be used to sort * strings according to the natural language rules of that locale. diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java index f444d36b5f..264ebfbb79 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java +++ b/phoenix-core/src/main/java/org/apache
[phoenix] 03/03: PHOENIX-6818 Remove dependency on the i18n-util library
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git commit e4861a3fe9e972a85cd7bd431ab886d19168a15f Author: Mate Szalay-Beko AuthorDate: Thu Nov 10 16:11:49 2022 +0100 PHOENIX-6818 Remove dependency on the i18n-util library i18n-util is not maintained anymore, but uses icu4j dependencies having CVE issues. To avoid these problems, I copied the relevant code from i18n-util and used the latest icu4j version. --- dev/release_files/LICENSE |2 +- phoenix-core/pom.xml |8 +- .../expression/function/CollationKeyFunction.java | 12 +- .../phoenix/expression/function/LowerFunction.java |3 +- .../phoenix/expression/function/UpperFunction.java | 21 +- .../apache/phoenix/util/DeferredStringBuilder.java | 135 +++ .../apache/phoenix/util/i18n/LinguisticSort.java | 1172 .../org/apache/phoenix/util/i18n/LocaleUtils.java | 86 ++ .../org/apache/phoenix/util/i18n/OracleUpper.java | 82 ++ .../apache/phoenix/util/i18n/OracleUpperTable.java | 337 ++ .../org/apache/phoenix/util/i18n/package-info.java | 27 + .../phoenix/util/i18n/LinguisticSortTest.java | 650 +++ .../util/i18n/OracleUpperTableGeneratorTest.java | 391 +++ pom.xml| 13 +- 14 files changed, 2912 insertions(+), 27 deletions(-) diff --git a/dev/release_files/LICENSE b/dev/release_files/LICENSE index 4577518c7a..c3c68268f8 100644 --- a/dev/release_files/LICENSE +++ b/dev/release_files/LICENSE @@ -254,7 +254,7 @@ Janino Compiler (https://github.com/janino-compiler/janino) Hamcrest-core 1.3 (http://www.hamcrest.org) Copyright (c) 2000-2006, www.hamcrest.org -i18n-util 1.0.1 (https://github.com/salesforce/i18n-util) Copyright (c) 2017, Salesforce.com, Inc. All rights reserved. +icu4j (https://github.com/unicode-org/icu) Copyright (c) 2016 and later Unicode, Inc. and others. All Rights Reserved. --- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 3df5ef68a2..f1079105d3 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -549,8 +549,12 @@ stream - com.salesforce.i18n - i18n-util + com.ibm.icu + icu4j + + + com.ibm.icu + icu4j-localespi com.lmax diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/CollationKeyFunction.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/CollationKeyFunction.java index f5cbdc4557..676b6460df 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/CollationKeyFunction.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/CollationKeyFunction.java @@ -35,11 +35,11 @@ import org.apache.phoenix.schema.types.PInteger; import org.apache.phoenix.schema.types.PVarbinary; import org.apache.phoenix.schema.types.PVarchar; import org.apache.phoenix.util.VarBinaryFormatter; +import org.apache.phoenix.util.i18n.LinguisticSort; +import org.apache.phoenix.util.i18n.LocaleUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.force.db.i18n.LinguisticSort; -import com.force.i18n.LocaleUtils; /** * A Phoenix Function that calculates a collation key for an input string based @@ -51,10 +51,12 @@ import com.force.i18n.LocaleUtils; * are all valid locale representations. Note the language code, country code * and variant are used as arguments to the constructor of java.util.Locale. * - * This function uses the open-source i18n-util package to obtain the collators - * it needs from the provided locale. + * This function originally used the open-source i18n-util package to obtain the + * collators it needs from the provided locale. As i18n-util is not maintained + * anymore, the relevant parts from it were copied into Phoenix. + * See: https://issues.apache.org/jira/browse/PHOENIX-6818 * - * The LinguisticSort implementation in i18n-util encapsulates sort-related + * The LinguisticSort implementation from i18n-util encapsulates sort-related * functionality for a substantive list of locales. For each locale, it provides * a collator and an Oracle-specific database function that can be used to sort * strings according to the natural language rules of that locale. diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java index f444d36b5f..264ebfbb79 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/LowerFunction.java @@ -30,8 +30,7 @@ import org.apache.phoenix.parse.FunctionParseNode; import org.apache.phoenix.schema.tuple.Tuple; import
[phoenix] 01/03: PHOENIX-6829: Add code coverage report aggregation with Jacoco
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 4ed1a16351e12e1f3b892864d72ee15599e6dd4e
Author: Dóra Horváth
AuthorDate: Thu Nov 3 12:43:44 2022 +0100
PHOENIX-6829: Add code coverage report aggregation with Jacoco
---
dev/code-coverage/README.md | 9 +-
dev/code-coverage/run-coverage.sh | 6 +-
phantomjsdriver.log | 675 ++
pom.xml | 42 ++-
test-reporting/pom.xml| 108 ++
5 files changed, 830 insertions(+), 10 deletions(-)
diff --git a/dev/code-coverage/README.md b/dev/code-coverage/README.md
index 713fde79ef..6772426094 100644
--- a/dev/code-coverage/README.md
+++ b/dev/code-coverage/README.md
@@ -18,17 +18,18 @@
# Code analysis
-The `run-coverage.sh` script runs maven with the codecoverage profile
+The `run-coverage.sh` script runs maven with the **coverage** profile
which generates the test coverage data for the java classes.
If the required parameters are given it also runs the sonar code analysis
and uploads the results to the given SonarQube Server.
## Running code analysis
-After running the script the JaCoCo code coverage library generated reports can
-be found under the `target/site/jacoco/` folders of each module and submodule.
+After running the script the aggregated report generated by the JaCoCo
+code coverage library can be found in the test-reporting module
+under the `/target/code-coverage/jacoco-reports/` folder.
-Here is how you can generate the code coverage reports:
+Here is how you can generate the code coverage report:
```./dev/code-coverage/run-coverage.sh```
diff --git a/dev/code-coverage/run-coverage.sh
b/dev/code-coverage/run-coverage.sh
index d84360a419..ff066e578c 100755
--- a/dev/code-coverage/run-coverage.sh
+++ b/dev/code-coverage/run-coverage.sh
@@ -46,13 +46,11 @@ execute() {
THREADS=1
fi
- mvn clean install -B -e -f "${MAIN_POM}" -Pcodecoverage -DskipShade
-DskipTests -fn -T "$THREADS"
- mvn test -B -e -f "${MAIN_POM}" -Pcodecoverage -DskipShade -Dparallel-tests
-fn -T "$THREADS"
- mvn verify -B -e -f "${MAIN_POM}" -Pcodecoverage -DskipTests -fn -T
"$THREADS"
+ mvn -B -e -f "${MAIN_POM}" clean verify -Pcoverage -Dskip.code-coverage -fn
-T "$THREADS"
# If the required parameters are given, the code coverage results are
uploaded to the SonarQube Server
if [ -n "$SONAR_LOGIN" ] && [ -n "$SONAR_PROJECT_KEY" ] && [ -n "$SONAR_URL"
]; then
-mvn -B -e -f "${MAIN_POM}" -T "$THREADS" -Psonar sonar:sonar
-Dsonar.host.url="$SONAR_URL" \
+mvn -B -e -f "${MAIN_POM}" -T "$THREADS" -Pcoverage sonar:sonar
-Dsonar.host.url="$SONAR_URL" \
-Dsonar.login="$SONAR_LOGIN" -Dsonar.projectKey="$SONAR_PROJECT_KEY"
-Dsonar.projectName="$SONAR_PROJECT_NAME"
fi
}
diff --git a/phantomjsdriver.log b/phantomjsdriver.log
new file mode 100644
index 00..df070b4e12
--- /dev/null
+++ b/phantomjsdriver.log
@@ -0,0 +1,675 @@
+[INFO - 2022-08-22T07:28:26.132Z] GhostDriver - Main - running on port 6361
+[INFO - 2022-08-22T07:28:26.721Z] Session
[03257ba0-21ec-11ed-9241-8536ef6f93a7] - page.settings -
{"XSSAuditingEnabled":false,"javascriptCanCloseWindows":true,"javascriptCanOpenWindows":true,"javascriptEnabled":true,"loadImages":true,"localToRemoteUrlAccessEnabled":false,"userAgent":"Mozilla/5.0
(Macintosh; Intel Mac OS X) AppleWebKit/538.1 (KHTML, like Gecko)
PhantomJS/2.1.1 Safari/538.1","webSecurityEnabled":true}
+[INFO - 2022-08-22T07:28:26.722Z] Session
[03257ba0-21ec-11ed-9241-8536ef6f93a7] - page.customHeaders: - {}
+[INFO - 2022-08-22T07:28:26.722Z] Session
[03257ba0-21ec-11ed-9241-8536ef6f93a7] - Session.negotiatedCapabilities -
{"browserName":"phantomjs","version":"2.1.1","driverName":"ghostdriver","driverVersion":"1.2.0","platform":"mac-unknown-64bit","javascriptEnabled":true,"takesScreenshot":true,"handlesAlerts":false,"databaseEnabled":false,"locationContextEnabled":false,"applicationCacheEnabled":false,"browserConnectionEnabled":false,"cssSelectorsEnabled":true,"webStorageEnabled":false,"rota
[...]
+[INFO - 2022-08-22T07:28:26.722Z] SessionManagerReqHand -
_postNewSessionCommand - New Session Created:
03257ba0-21ec-11ed-9241-8536ef6f93a7
+[ERROR - 2022-08-22T07:28:27.307Z] Session
[03257ba0-21ec-11ed-9241-8536ef6f93a7] - page.onError - msg: Spec 'TracingC
[phoenix] 02/03: remove unnecessary test-reporting module
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 669ad21b86b4e4d8868e43624b6124220149d8dc
Author: Dóra Horváth
AuthorDate: Thu Nov 10 21:13:43 2022 +0100
remove unnecessary test-reporting module
---
dev/code-coverage/README.md | 2 +-
phantomjsdriver.log | 675
phoenix-assembly/pom.xml| 67 +
pom.xml | 9 +-
test-reporting/pom.xml | 108 ---
5 files changed, 70 insertions(+), 791 deletions(-)
diff --git a/dev/code-coverage/README.md b/dev/code-coverage/README.md
index 6772426094..ab7289c6a9 100644
--- a/dev/code-coverage/README.md
+++ b/dev/code-coverage/README.md
@@ -26,7 +26,7 @@ and uploads the results to the given SonarQube Server.
## Running code analysis
After running the script the aggregated report generated by the JaCoCo
-code coverage library can be found in the test-reporting module
+code coverage library can be found in the phoenix-assembly module
under the `/target/code-coverage/jacoco-reports/` folder.
Here is how you can generate the code coverage report:
diff --git a/phantomjsdriver.log b/phantomjsdriver.log
deleted file mode 100644
index df070b4e12..00
--- a/phantomjsdriver.log
+++ /dev/null
@@ -1,675 +0,0 @@
-[INFO - 2022-08-22T07:28:26.132Z] GhostDriver - Main - running on port 6361
-[INFO - 2022-08-22T07:28:26.721Z] Session
[03257ba0-21ec-11ed-9241-8536ef6f93a7] - page.settings -
{"XSSAuditingEnabled":false,"javascriptCanCloseWindows":true,"javascriptCanOpenWindows":true,"javascriptEnabled":true,"loadImages":true,"localToRemoteUrlAccessEnabled":false,"userAgent":"Mozilla/5.0
(Macintosh; Intel Mac OS X) AppleWebKit/538.1 (KHTML, like Gecko)
PhantomJS/2.1.1 Safari/538.1","webSecurityEnabled":true}
-[INFO - 2022-08-22T07:28:26.722Z] Session
[03257ba0-21ec-11ed-9241-8536ef6f93a7] - page.customHeaders: - {}
-[INFO - 2022-08-22T07:28:26.722Z] Session
[03257ba0-21ec-11ed-9241-8536ef6f93a7] - Session.negotiatedCapabilities -
{"browserName":"phantomjs","version":"2.1.1","driverName":"ghostdriver","driverVersion":"1.2.0","platform":"mac-unknown-64bit","javascriptEnabled":true,"takesScreenshot":true,"handlesAlerts":false,"databaseEnabled":false,"locationContextEnabled":false,"applicationCacheEnabled":false,"browserConnectionEnabled":false,"cssSelectorsEnabled":true,"webStorageEnabled":false,"rota
[...]
-[INFO - 2022-08-22T07:28:26.722Z] SessionManagerReqHand -
_postNewSessionCommand - New Session Created:
03257ba0-21ec-11ed-9241-8536ef6f93a7
-[ERROR - 2022-08-22T07:28:27.307Z] Session
[03257ba0-21ec-11ed-9241-8536ef6f93a7] - page.onError - msg: Spec 'TracingCtrl
should fetch trace from phoenix' has no expectations.
-[ERROR - 2022-08-22T07:28:27.307Z] Session
[03257ba0-21ec-11ed-9241-8536ef6f93a7] - page.onError - stack:
- specDone (http://localhost:50322/webjars/jasmine/jasmine-html.js:106)
-[INFO - 2022-08-22T07:28:27.535Z] ShutdownReqHand - _handle - About to
shutdown
-[INFO - 2022-08-22T08:36:57.095Z] GhostDriver - Main - running on port 16990
-[INFO - 2022-08-22T08:36:57.332Z] Session
[95436700-21f5-11ed-8a37-73a8b9a3b7a5] - page.settings -
{"XSSAuditingEnabled":false,"javascriptCanCloseWindows":true,"javascriptCanOpenWindows":true,"javascriptEnabled":true,"loadImages":true,"localToRemoteUrlAccessEnabled":false,"userAgent":"Mozilla/5.0
(Macintosh; Intel Mac OS X) AppleWebKit/538.1 (KHTML, like Gecko)
PhantomJS/2.1.1 Safari/538.1","webSecurityEnabled":true}
-[INFO - 2022-08-22T08:36:57.332Z] Session
[95436700-21f5-11ed-8a37-73a8b9a3b7a5] - page.customHeaders: - {}
-[INFO - 2022-08-22T08:36:57.332Z] Session
[95436700-21f5-11ed-8a37-73a8b9a3b7a5] - Session.negotiatedCapabilities -
{"browserName":"phantomjs","version":"2.1.1","driverName":"ghostdriver","driverVersion":"1.2.0","platform":"mac-unknown-64bit","javascriptEnabled":true,"takesScreenshot":true,"handlesAlerts":false,"databaseEnabled":false,"locationContextEnabled":false,"applicationCacheEnabled":false,"browserConnectionEnabled":false,"cssSelectorsEnabled":true,"webStorageEnabled":false,"rota
[...]
-[INFO - 2022-08-22T08:36:57.332Z] SessionManagerReqHand -
_postNewSessionCommand - New Session Created:
95436700-21f5-11ed-8a37-73a8b9a3b7a5
-[ERROR - 2022-08-22T08:36:57.659Z] Session
[95436
[phoenix] branch master updated (8820d69fa2 -> e4861a3fe9)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git from 8820d69fa2 PHOENIX-6827 Update hbase-version to 2.4.15 in phoenix master branch (#1523) new 4ed1a16351 PHOENIX-6829: Add code coverage report aggregation with Jacoco new 669ad21b86 remove unnecessary test-reporting module new e4861a3fe9 PHOENIX-6818 Remove dependency on the i18n-util library 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: dev/code-coverage/README.md|9 +- dev/code-coverage/run-coverage.sh |6 +- dev/release_files/LICENSE |2 +- phoenix-assembly/pom.xml | 67 ++ phoenix-core/pom.xml |8 +- .../expression/function/CollationKeyFunction.java | 12 +- .../phoenix/expression/function/LowerFunction.java |3 +- .../phoenix/expression/function/UpperFunction.java | 21 +- .../apache/phoenix/util/DeferredStringBuilder.java | 135 +++ .../apache/phoenix/util/i18n/LinguisticSort.java | 1172 .../org/apache/phoenix/util/i18n/LocaleUtils.java | 86 ++ .../org/apache/phoenix/util/i18n/OracleUpper.java | 82 ++ .../apache/phoenix/util/i18n/OracleUpperTable.java | 337 ++ .../org/apache/phoenix/util/i18n/package-info.java | 11 + .../phoenix/util/i18n/LinguisticSortTest.java | 650 +++ .../util/i18n/OracleUpperTableGeneratorTest.java | 391 +++ pom.xml| 50 +- 17 files changed, 3005 insertions(+), 37 deletions(-) create mode 100644 phoenix-core/src/main/java/org/apache/phoenix/util/DeferredStringBuilder.java create mode 100644 phoenix-core/src/main/java/org/apache/phoenix/util/i18n/LinguisticSort.java create mode 100644 phoenix-core/src/main/java/org/apache/phoenix/util/i18n/LocaleUtils.java create mode 100644 phoenix-core/src/main/java/org/apache/phoenix/util/i18n/OracleUpper.java create mode 100644 phoenix-core/src/main/java/org/apache/phoenix/util/i18n/OracleUpperTable.java copy src/main/config/checkstyle/header.txt => phoenix-core/src/main/java/org/apache/phoenix/util/i18n/package-info.java (65%) create mode 100644 phoenix-core/src/test/java/org/apache/phoenix/util/i18n/LinguisticSortTest.java create mode 100644 phoenix-core/src/test/java/org/apache/phoenix/util/i18n/OracleUpperTableGeneratorTest.java
[phoenix-connectors] branch master updated: PHOENIX-6831 Remove bogus Ant dependency from hive connector test util
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new 4da44c7 PHOENIX-6831 Remove bogus Ant dependency from hive connector
test util
4da44c7 is described below
commit 4da44c78181f2b76c525b1694f962fa909d2d596
Author: Istvan Toth
AuthorDate: Wed Nov 9 08:50:03 2022 +0100
PHOENIX-6831 Remove bogus Ant dependency from hive connector test util
---
phoenix-hive-base/pom.xml | 7 ---
.../src/it/java/org/apache/hadoop/hive/ql/QTestUtil.java | 3 +--
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/phoenix-hive-base/pom.xml b/phoenix-hive-base/pom.xml
index 5521583..8903e7e 100644
--- a/phoenix-hive-base/pom.xml
+++ b/phoenix-hive-base/pom.xml
@@ -181,13 +181,6 @@
-
-
- org.apache.ant
- ant
- provided
- 1.9.1
-
org.apache.logging.log4j
log4j-api
diff --git
a/phoenix-hive-base/src/it/java/org/apache/hadoop/hive/ql/QTestUtil.java
b/phoenix-hive-base/src/it/java/org/apache/hadoop/hive/ql/QTestUtil.java
index 54d16de..23fec0b 100644
--- a/phoenix-hive-base/src/it/java/org/apache/hadoop/hive/ql/QTestUtil.java
+++ b/phoenix-hive-base/src/it/java/org/apache/hadoop/hive/ql/QTestUtil.java
@@ -121,7 +121,6 @@ import org.apache.logging.log4j.util.Strings;
import org.apache.phoenix.compat.CompatUtil;
import org.apache.phoenix.compat.HiveCompatUtil;
import org.apache.phoenix.compat.MyResult;
-import org.apache.tools.ant.BuildException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.ZooKeeper;
@@ -2176,7 +2175,7 @@ public class QTestUtil {
}
int pos = Arrays.binarySearch(cachedQvFileList, tname,
String.CASE_INSENSITIVE_ORDER);
if (pos >= 0) {
- throw new BuildException("Unexpected file list element: " +
cachedQvFileList[pos]);
+ throw new IllegalArgumentException("Unexpected file list element: " +
cachedQvFileList[pos]);
}
List result = null;
for (pos = (-pos - 1); pos < cachedQvFileList.length; ++pos) {
[phoenix] branch 5.1 updated: PHOENIX-6784 PhantomJS fails on recent Linux distributions
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new b8a051dc4d PHOENIX-6784 PhantomJS fails on recent Linux distributions
b8a051dc4d is described below
commit b8a051dc4d324bf3bb7d33a58ede0201ba8f2bb6
Author: Istvan Toth
AuthorDate: Mon Oct 24 10:04:32 2022 +0200
PHOENIX-6784 PhantomJS fails on recent Linux distributions
---
phoenix-tracing-webapp/pom.xml | 92 +-
1 file changed, 55 insertions(+), 37 deletions(-)
diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml
index bdbcf21e38..da3101439c 100755
--- a/phoenix-tracing-webapp/pom.xml
+++ b/phoenix-tracing-webapp/pom.xml
@@ -126,42 +126,6 @@
-
- com.github.searls
- jasmine-maven-plugin
-
-
-
-test
-
-
-
-
-
- 2.1.1
-
-
-
-
${project.basedir}/src/main/webapp/js/lib/jquery.min.js
-
${project.basedir}/src/main/webapp/js/lib/angular.js
-
${project.basedir}/src/main/webapp/js/lib/angular-route.js
-
${project.basedir}/src/main/webapp/js/lib/angular-mocks.js
-
${project.basedir}/src/main/webapp/js/lib/ng-google-chart.js
-
${project.basedir}/src/main/webapp/js/lib/bootstrap.js
-
${project.basedir}/src/main/webapp/js/lib/ui-bootstrap-tpls.js
-
${project.basedir}/src/main/webapp/js/controllers/accordion-controllers.js
-
${project.basedir}/src/main/webapp/js/controllers/timeline-controllers.js
-
${project.basedir}/src/main/webapp/js/controllers/search-controllers.js
-
${project.basedir}/src/main/webapp/js/controllers/dependency-tree-controllers.js
- ${project.basedir}/src/main/webapp/js/app.js
-
${project.basedir}/src/main/webapp/js/controllers/list-controllers.js
-
${project.basedir}/src/main/webapp/js/controllers/trace-count-controllers.js
-
${project.basedir}/src/main/webapp/js/controllers/trace-distribution-controllers.js
-
-
-${basedir}/src/test/webapp/js/specs
-
-
org.apache.rat
apache-rat-plugin
@@ -175,5 +139,59 @@
-
+
+
+
+jasmin-tests
+
+
+jasmine-tests
+
+
+
+
+
+com.github.searls
+jasmine-maven-plugin
+
+
+
+test
+
+
+
+
+
+2.1.1
+
+
+
+
${project.basedir}/src/main/webapp/js/lib/jquery.min.js
+
${project.basedir}/src/main/webapp/js/lib/angular.js
+
${project.basedir}/src/main/webapp/js/lib/angular-route.js
+
${project.basedir}/src/main/webapp/js/lib/angular-mocks.js
+
${project.basedir}/src/main/webapp/js/lib/ng-google-chart.js
+
${project.basedir}/src/main/webapp/js/lib/bootstrap.js
+
${project.basedir}/src/main/webapp/js/lib/ui-bootstrap-tpls.js
+
${project.basedir}/src/main/webapp/js/controllers/accordion-controllers.js
+
${project.basedir}/src/main/webapp/js/controllers/timeline-controllers.js
+
${project.basedir}/src/main/webapp/js/controllers/search-controllers.js
+
${project.basedir}/src/main/webapp/js/controllers/dependency-tree-controllers.js
+
${project.basedir}/src/main/webapp/js/app.js
+
${project.basedir}/src/main/webapp/js/controllers/list-controllers.js
+
${project.basedir}/src/main/webapp/js/controllers/trace-count-controllers.js
+
${project.basedir}/src/main/webapp/js/controllers/trace-distribution-controllers.js
+
+
+
${basedir}/src/test/webapp/js/specs
+
+
+
+
+
+
[phoenix] branch master updated: PHOENIX-6784 PhantomJS fails on recent Linux distributions
This is an automated email from the ASF dual-hosted git repository.
stoty 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 f246599041 PHOENIX-6784 PhantomJS fails on recent Linux distributions
f246599041 is described below
commit f246599041343c02cc98341dd85122c8da85d33c
Author: Istvan Toth
AuthorDate: Mon Oct 24 10:04:32 2022 +0200
PHOENIX-6784 PhantomJS fails on recent Linux distributions
---
phoenix-tracing-webapp/pom.xml | 92 +-
1 file changed, 55 insertions(+), 37 deletions(-)
diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml
index 60ad337e73..e2e057b676 100755
--- a/phoenix-tracing-webapp/pom.xml
+++ b/phoenix-tracing-webapp/pom.xml
@@ -137,42 +137,6 @@
-
- com.github.searls
- jasmine-maven-plugin
-
-
-
-test
-
-
-
-
-
- 2.1.1
-
-
-
-
${project.basedir}/src/main/webapp/js/lib/jquery.min.js
-
${project.basedir}/src/main/webapp/js/lib/angular.js
-
${project.basedir}/src/main/webapp/js/lib/angular-route.js
-
${project.basedir}/src/main/webapp/js/lib/angular-mocks.js
-
${project.basedir}/src/main/webapp/js/lib/ng-google-chart.js
-
${project.basedir}/src/main/webapp/js/lib/bootstrap.js
-
${project.basedir}/src/main/webapp/js/lib/ui-bootstrap-tpls.js
-
${project.basedir}/src/main/webapp/js/controllers/accordion-controllers.js
-
${project.basedir}/src/main/webapp/js/controllers/timeline-controllers.js
-
${project.basedir}/src/main/webapp/js/controllers/search-controllers.js
-
${project.basedir}/src/main/webapp/js/controllers/dependency-tree-controllers.js
- ${project.basedir}/src/main/webapp/js/app.js
-
${project.basedir}/src/main/webapp/js/controllers/list-controllers.js
-
${project.basedir}/src/main/webapp/js/controllers/trace-count-controllers.js
-
${project.basedir}/src/main/webapp/js/controllers/trace-distribution-controllers.js
-
-
-${basedir}/src/test/webapp/js/specs
-
-
org.apache.rat
apache-rat-plugin
@@ -186,5 +150,59 @@
-
+
+
+
+jasmin-tests
+
+
+jasmine-tests
+
+
+
+
+
+com.github.searls
+jasmine-maven-plugin
+
+
+
+test
+
+
+
+
+
+2.1.1
+
+
+
+
${project.basedir}/src/main/webapp/js/lib/jquery.min.js
+
${project.basedir}/src/main/webapp/js/lib/angular.js
+
${project.basedir}/src/main/webapp/js/lib/angular-route.js
+
${project.basedir}/src/main/webapp/js/lib/angular-mocks.js
+
${project.basedir}/src/main/webapp/js/lib/ng-google-chart.js
+
${project.basedir}/src/main/webapp/js/lib/bootstrap.js
+
${project.basedir}/src/main/webapp/js/lib/ui-bootstrap-tpls.js
+
${project.basedir}/src/main/webapp/js/controllers/accordion-controllers.js
+
${project.basedir}/src/main/webapp/js/controllers/timeline-controllers.js
+
${project.basedir}/src/main/webapp/js/controllers/search-controllers.js
+
${project.basedir}/src/main/webapp/js/controllers/dependency-tree-controllers.js
+
${project.basedir}/src/main/webapp/js/app.js
+
${project.basedir}/src/main/webapp/js/controllers/list-controllers.js
+
${project.basedir}/src/main/webapp/js/controllers/trace-count-controllers.js
+
${project.basedir}/src/main/webapp/js/controllers/trace-distribution-controllers.js
+
+
+
${basedir}/src/test/webapp/js/specs
+
+
+
+
+
+
[phoenix] branch 5.1 updated: PHOENIX-6816 Update Jetty to 9.4.49.v20220914
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new 390cce3c12 PHOENIX-6816 Update Jetty to 9.4.49.v20220914 390cce3c12 is described below commit 390cce3c125913518cece9e1aede9ff31e8e2908 Author: Istvan Toth AuthorDate: Thu Oct 20 10:53:04 2022 +0200 PHOENIX-6816 Update Jetty to 9.4.49.v20220914 --- phoenix-tracing-webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index 6b56f02ef7..bdbcf21e38 100755 --- a/phoenix-tracing-webapp/pom.xml +++ b/phoenix-tracing-webapp/pom.xml @@ -32,7 +32,7 @@ 3.1.0 - 9.4.43.v20210629 + 9.4.49.v20220914
[phoenix] branch master updated: PHOENIX-6816 Update Jetty to 9.4.49.v20220914
This is an automated email from the ASF dual-hosted git repository. stoty 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 4ddbb244a5 PHOENIX-6816 Update Jetty to 9.4.49.v20220914 4ddbb244a5 is described below commit 4ddbb244a54321bcfa6053965c1aee01bc487af9 Author: Istvan Toth AuthorDate: Thu Oct 20 10:53:04 2022 +0200 PHOENIX-6816 Update Jetty to 9.4.49.v20220914 --- phoenix-tracing-webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index 882cf192ac..60ad337e73 100755 --- a/phoenix-tracing-webapp/pom.xml +++ b/phoenix-tracing-webapp/pom.xml @@ -32,7 +32,7 @@ 3.1.0 - 9.4.43.v20210629 + 9.4.49.v20220914
[phoenix] branch 5.1 updated: PHOENIX-6815 Update Gson version to 2.9.1
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new db9db6ce86 PHOENIX-6815 Update Gson version to 2.9.1 db9db6ce86 is described below commit db9db6ce8645dcc60b8173a4c157a320e628884f Author: Istvan Toth AuthorDate: Thu Oct 20 10:47:12 2022 +0200 PHOENIX-6815 Update Gson version to 2.9.1 --- phoenix-pherf/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 04b8714151..cf7f3b15c7 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -34,7 +34,7 @@ 1.2.1 -2.8.6 +2.9.1 3.3 1.1 0.15
[phoenix] branch master updated: PHOENIX-6815 Update Gson version to 2.9.1
This is an automated email from the ASF dual-hosted git repository. stoty 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 de8fc893ad PHOENIX-6815 Update Gson version to 2.9.1 de8fc893ad is described below commit de8fc893ad1575c0a1e0047d3f84ad18918a6d31 Author: Istvan Toth AuthorDate: Thu Oct 20 10:47:12 2022 +0200 PHOENIX-6815 Update Gson version to 2.9.1 --- phoenix-pherf/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index a7cb5c5c27..62e6d46f6b 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -34,7 +34,7 @@ 1.2.1 -2.8.6 +2.9.1 3.3 1.1 0.15
[phoenix] branch master updated: PHOENIX-6715 Update Omid to 1.1.0
This is an automated email from the ASF dual-hosted git repository.
stoty 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 4ca3d94488 PHOENIX-6715 Update Omid to 1.1.0
4ca3d94488 is described below
commit 4ca3d94488e902a47e507507db678ebbe9440142
Author: Istvan Toth
AuthorDate: Tue May 17 15:34:20 2022 +0200
PHOENIX-6715 Update Omid to 1.1.0
---
phoenix-core/pom.xml | 18 ++--
.../phoenix/coprocessor/OmidGCProcessor.java | 2 -
pom.xml| 117 ++---
3 files changed, 16 insertions(+), 121 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index f403fbdadc..f94625adf9 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -413,27 +413,23 @@
org.apache.omid
- omid-hbase-client-hbase2.x
+ omid-hbase-client
org.apache.omid
- omid-hbase-coprocessor-hbase2.x
+ omid-hbase-coprocessor
org.apache.omid
- omid-hbase-shims-hbase2.x
+ omid-hbase-common
org.apache.omid
- omid-hbase-common-hbase2.x
+ omid-timestamp-storage
org.apache.omid
- omid-timestamp-storage-hbase2.x
-
-
- org.apache.omid
- omid-hbase-commit-table-hbase2.x
+ omid-hbase-commit-table
org.apache.omid
@@ -451,12 +447,12 @@
org.apache.omid
- omid-tso-server-hbase2.x
+ omid-tso-server
test
org.apache.omid
- omid-tso-server-hbase2.x
+ omid-tso-server
test
test-jar
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/OmidGCProcessor.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/OmidGCProcessor.java
index 0fba8cc36a..379e90a1ae 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/OmidGCProcessor.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/OmidGCProcessor.java
@@ -20,9 +20,7 @@ package org.apache.phoenix.coprocessor;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;
import org.apache.hadoop.hbase.coprocessor.RegionObserver;
-import org.apache.omid.committable.CommitTable;
import org.apache.omid.transaction.OmidCompactor;
-import org.apache.omid.transaction.OmidSnapshotFilter;
import java.io.IOException;
import java.util.Optional;
diff --git a/pom.xml b/pom.xml
index 76d74bfe8a..3b3f3502ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
3.2.2
2.10.5
2.1.31
-1.0.2
+1.1.0
2.9.5
1.0.4
4.0
@@ -366,16 +366,7 @@
- org.apache.omid:omid-hbase-shims-hbase2.x
-
-
- org.apache.omid:omid-hbase-common-hbase2.x:jar
-
-
- org.apache.omid:omid-hbase-commit-table-hbase2.x
-
-
- org.apache.omid:omid-timestamp-storage-hbase2.x
+ org.apache.omid:*
org.apache.hbase:hbase-testing-util
@@ -419,9 +410,6 @@
${project.build.directory}/classes/mrapp-generated-classpath
-
-org.apache.omid:*hbase2.x
-
@@ -1093,17 +1081,9 @@
org.apache.omid
-omid-hbase-common-hbase2.x
+omid-hbase-common
${omid.version}
-
-org.apache.omid
-omid-hbase-shims-hbase1.x
-
-
-org.apache.omid
-omid-hbase-common-hbase1.x
-
com.google.inject
guice
@@ -1116,25 +1096,9 @@
org.apache.omid
-omid-hbase-client-hbase2.x
+omid-hbase-client
${omid.version}
-
-org.apache.omid
-omid-hbase-commit-table-hbase1.x
-
-
-org.apache.omid
-omid-hbase-common-hbase1.x
-
-
-org.apache.omid
-omid-hbase-client-hbase1.x
-
-
-org.apache.omid
-omid-hbase-shims-hbase1.x
-
org.testng
testng
@@ -1143,21 +1107,9 @@
org.apache.omid
-omid-hbase-coprocessor-hbase2.x
+omid-hbase-coprocessor
${omid.version}
-
-org.apache.omid
-omid-hbase-commit-table-hbase1.x
-
-
-org.apache.omid
- omid-hbase-client-hbase1.x
svn commit: r1904694 - /phoenix/site/source/src/site/markdown/download.md
Author: stoty
Date: Wed Oct 19 13:16:16 2022
New Revision: 1904694
URL: http://svn.apache.org/viewvc?rev=1904694=rev
Log:
missing .md file change from omid download update
Modified:
phoenix/site/source/src/site/markdown/download.md
Modified: phoenix/site/source/src/site/markdown/download.md
URL:
http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/download.md?rev=1904694=1904693=1904694=diff
==
--- phoenix/site/source/src/site/markdown/download.md (original)
+++ phoenix/site/source/src/site/markdown/download.md Wed Oct 19 13:16:16 2022
@@ -79,7 +79,7 @@ addRelease2('5.1.2', '07/jun/2021', '2.1
addRelease2('4.16.1', '21/may/2021', '1.3', '1.4', '1.5', '1.6');
addPhoenixdbRelease('1.2.0','15/jul/2022');
addPhoenixThirdpartyRelease('2.0.0','19/apr/2022');
-addPhoenixOmidRelease('1.0.2','23/nov/2020');
+addPhoenixOmidRelease('1.1.0','17/oct/2022');
addPhoenixTephraRelease('0.16.1','13/may/2021');
addPhoenixQueryServerRelease('6.0.0','03/aug/2021');
svn commit: r1904636 - in /phoenix/site/publish: download.html language/datatypes.html language/functions.html language/index.html
Author: stoty
Date: Mon Oct 17 08:43:37 2022
New Revision: 1904636
URL: http://svn.apache.org/viewvc?rev=1904636=rev
Log:
Add download links for Omid 1.1.0
Modified:
phoenix/site/publish/download.html
phoenix/site/publish/language/datatypes.html
phoenix/site/publish/language/functions.html
phoenix/site/publish/language/index.html
Modified: phoenix/site/publish/download.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/download.html?rev=1904636=1904635=1904636=diff
==
--- phoenix/site/publish/download.html (original)
+++ phoenix/site/publish/download.html Mon Oct 17 08:43:37 2022
@@ -1,7 +1,7 @@
@@ -256,7 +256,7 @@ addRelease2('5.1.2', '07/jun/2021', '2.1
addRelease2('4.16.1', '21/may/2021', '1.3', '1.4', '1.5', '1.6');
addPhoenixdbRelease('1.2.0','15/jul/2022');
addPhoenixThirdpartyRelease('2.0.0','19/apr/2022');
-addPhoenixOmidRelease('1.0.2','23/nov/2020');
+addPhoenixOmidRelease('1.1.0','17/oct/2022');
addPhoenixTephraRelease('0.16.1','13/may/2021');
addPhoenixQueryServerRelease('6.0.0','03/aug/2021');
Modified: phoenix/site/publish/language/datatypes.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1904636=1904635=1904636=diff
==
--- phoenix/site/publish/language/datatypes.html (original)
+++ phoenix/site/publish/language/datatypes.html Mon Oct 17 08:43:37 2022
@@ -1,7 +1,7 @@
Modified: phoenix/site/publish/language/functions.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1904636=1904635=1904636=diff
==
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Mon Oct 17 08:43:37 2022
@@ -1,7 +1,7 @@
Modified: phoenix/site/publish/language/index.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1904636=1904635=1904636=diff
==
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Mon Oct 17 08:43:37 2022
@@ -1,7 +1,7 @@
[phoenix-omid] branch master updated: Preparing development version 1.1.1-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git The following commit(s) were added to refs/heads/master by this push: new c1ff456b Preparing development version 1.1.1-SNAPSHOT c1ff456b is described below commit c1ff456bca3e70f6ac01d640a1d4badc76822cbd Author: Istvan Toth AuthorDate: Mon Oct 17 10:33:42 2022 +0200 Preparing development version 1.1.1-SNAPSHOT --- benchmarks/pom.xml | 2 +- codahale-metrics/pom.xml | 2 +- commit-table/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- hbase-client/pom.xml | 2 +- hbase-commit-table/pom.xml | 2 +- hbase-common/pom.xml | 2 +- hbase-coprocessor/pom.xml | 2 +- hbase-tools/pom.xml| 2 +- metrics/pom.xml| 2 +- pom.xml| 2 +- statemachine/pom.xml | 2 +- timestamp-storage/pom.xml | 2 +- transaction-client/pom.xml | 2 +- tso-server/pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index dca1e8ea..42fabc00 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -19,7 +19,7 @@ org.apache.omid omid -1.1.0 +1.1.1-SNAPSHOT omid-benchmarks diff --git a/codahale-metrics/pom.xml b/codahale-metrics/pom.xml index bd424492..f4152ad0 100644 --- a/codahale-metrics/pom.xml +++ b/codahale-metrics/pom.xml @@ -17,7 +17,7 @@ org.apache.omid omid -1.1.0 +1.1.1-SNAPSHOT 4.0.0 diff --git a/commit-table/pom.xml b/commit-table/pom.xml index cc98b4e4..c2a76e34 100644 --- a/commit-table/pom.xml +++ b/commit-table/pom.xml @@ -19,7 +19,7 @@ org.apache.omid omid -1.1.0 +1.1.1-SNAPSHOT omid-commit-table diff --git a/common/pom.xml b/common/pom.xml index 96074db8..bf1c09d0 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -19,7 +19,7 @@ org.apache.omid omid -1.1.0 +1.1.1-SNAPSHOT omid-common diff --git a/examples/pom.xml b/examples/pom.xml index 32fe7258..0e95d22f 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -19,7 +19,7 @@ org.apache.omid omid -1.1.0 +1.1.1-SNAPSHOT omid-examples diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 9193e790..b84ead2f 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -19,7 +19,7 @@ org.apache.omid omid -1.1.0 +1.1.1-SNAPSHOT omid-hbase-client diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml index 995aad90..1b12b516 100644 --- a/hbase-commit-table/pom.xml +++ b/hbase-commit-table/pom.xml @@ -19,7 +19,7 @@ org.apache.omid omid -1.1.0 +1.1.1-SNAPSHOT omid-hbase-commit-table diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 19478450..134bc781 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -19,7 +19,7 @@ org.apache.omid omid -1.1.0 +1.1.1-SNAPSHOT omid-hbase-common diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml index f5365011..daccf84e 100644 --- a/hbase-coprocessor/pom.xml +++ b/hbase-coprocessor/pom.xml @@ -19,7 +19,7 @@ org.apache.omid omid -1.1.0 +1.1.1-SNAPSHOT omid-hbase-coprocessor diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml index 05862ab7..4b4d5088 100644 --- a/hbase-tools/pom.xml +++ b/hbase-tools/pom.xml @@ -19,7 +19,7 @@ org.apache.omid omid -1.1.0 +1.1.1-SNAPSHOT omid-hbase-tools diff --git a/metrics/pom.xml b/metrics/pom.xml index 2c648136..ad969f47 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -19,7 +19,7 @@ org.apache.omid omid -1.1.0 +1.1.1-SNAPSHOT omid-metrics diff --git a/pom.xml b/pom.xml index b7f4e475..513a096c 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ omid pom -1.1.0 +1.1.1-SNAPSHOT Apache Software Foundation diff --git a/statemachine/pom.xml b/statemachine/pom.xml index bbc00ea7..6f80a630 100644 --- a/statemachine/pom.xml +++ b/statemachine/pom.xml @@ -19,7 +19,7 @@ org.apache.omid omid -1.1.0 +1.1.1-SNAPSHOT State Machine diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml index a6335941..533ab230 100644 --- a/timestamp-storage/pom.xml +++ b/timestamp-storage/pom.xml @@ -19,7 +19,7 @@ org.apache.omid omid -1.1.0 +1.1.1-SNAPSHOT omid-timestamp-storage diff --git a/transaction-client/pom.xml b/transaction-client/pom.xml index 97f33dfd
[phoenix-omid] annotated tag 1.1.0 updated (3b9e16b7 -> 5a84b9ce)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to annotated tag 1.1.0 in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git *** WARNING: tag 1.1.0 was modified! *** from 3b9e16b7 (commit) to 5a84b9ce (tag) tagging 3b9e16b7537adbc90a7403507fb8aabd8d1fab0c (commit) replaces 1.0.2 by Istvan Toth on Mon Oct 17 10:28:29 2022 +0200 - Log - Phoenix Omid v1.1.0 release --- No new revisions were added by this update. Summary of changes:
svn commit: r57424 - /dev/phoenix/phoenix-omid-1.1.0RC0/ /release/phoenix/phoenix-omid-1.1.0/
Author: stoty Date: Mon Oct 17 08:26:48 2022 New Revision: 57424 Log: release Phoenix Omid 1.1.0 Added: release/phoenix/phoenix-omid-1.1.0/ - copied from r57423, dev/phoenix/phoenix-omid-1.1.0RC0/ Removed: dev/phoenix/phoenix-omid-1.1.0RC0/
svn commit: r57186 - in /dev/phoenix/phoenix-omid-1.1.0RC0: ./ CHANGES.md RELEASENOTES.md phoenix-omid-1.1.0-src.tar.gz phoenix-omid-1.1.0-src.tar.gz.asc phoenix-omid-1.1.0-src.tar.gz.sha512
Author: stoty Date: Thu Oct 6 14:02:21 2022 New Revision: 57186 Log: Apache phoenix-omid 1.1.0RC0 Added: dev/phoenix/phoenix-omid-1.1.0RC0/ dev/phoenix/phoenix-omid-1.1.0RC0/CHANGES.md dev/phoenix/phoenix-omid-1.1.0RC0/RELEASENOTES.md dev/phoenix/phoenix-omid-1.1.0RC0/phoenix-omid-1.1.0-src.tar.gz (with props) dev/phoenix/phoenix-omid-1.1.0RC0/phoenix-omid-1.1.0-src.tar.gz.asc dev/phoenix/phoenix-omid-1.1.0RC0/phoenix-omid-1.1.0-src.tar.gz.sha512 Added: dev/phoenix/phoenix-omid-1.1.0RC0/CHANGES.md == --- dev/phoenix/phoenix-omid-1.1.0RC0/CHANGES.md (added) +++ dev/phoenix/phoenix-omid-1.1.0RC0/CHANGES.md Thu Oct 6 14:02:21 2022 @@ -0,0 +1,113 @@ + + +# OMID Changelog + +## Release 1.1.0 - Unreleased (as of 2022-10-06) + + + +### IMPROVEMENTS: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [OMID-231](https://issues.apache.org/jira/browse/OMID-231) | Build and test Omid with Hadoop 3 | Major | . | +| [OMID-232](https://issues.apache.org/jira/browse/OMID-232) | Do not depend on netty-all | Major | . | +| [OMID-223](https://issues.apache.org/jira/browse/OMID-223) | Refactor Omid to use HBase 2 APIs internally | Major | . | +| [OMID-222](https://issues.apache.org/jira/browse/OMID-222) | Remove HBase1 support and update HBase 2 version to 2.4 | Major | . | +| [OMID-221](https://issues.apache.org/jira/browse/OMID-221) | Bump junit from 4.13 to 4.13.1 | Major | . | +| [OMID-220](https://issues.apache.org/jira/browse/OMID-220) | Update netty to 4.1.76.Final | Major | . | +| [OMID-209](https://issues.apache.org/jira/browse/OMID-209) | Migrate to commons-lang3 | Major | . | +| [OMID-202](https://issues.apache.org/jira/browse/OMID-202) | Refactor Omid to use Netty 4 | Major | . | + + +### BUG FIXES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [OMID-189](https://issues.apache.org/jira/browse/OMID-189) | Fix RAT check errors | Major | . | +| [OMID-230](https://issues.apache.org/jira/browse/OMID-230) | Update Netty and commons-io versions | Major | . | +| [OMID-229](https://issues.apache.org/jira/browse/OMID-229) | Allow only "squash and merge" from GitHub UI | Major | . | +| [OMID-224](https://issues.apache.org/jira/browse/OMID-224) | Switch default logging backend to log4j2 | Major | . | +| [OMID-216](https://issues.apache.org/jira/browse/OMID-216) | Remove log4j.properties from maven artifact | Major | . | +| [OMID-211](https://issues.apache.org/jira/browse/OMID-211) | HBase Shims leak testing dependencies as compile dependencies. | Major | . | +| [OMID-210](https://issues.apache.org/jira/browse/OMID-210) | Build failure on Linux ARM64 | Major | . | +| [OMID-198](https://issues.apache.org/jira/browse/OMID-198) | Replace static ports used for TSO server with random ports in the tests | Major | . | +| [OMID-200](https://issues.apache.org/jira/browse/OMID-200) | Omid client cannot use kerberos cache when using proxyUser | Blocker | . | +| [OMID-199](https://issues.apache.org/jira/browse/OMID-199) | Omid client cannot use pre-authenticated UserGroupInformation.getCurrentUser() | Blocker | . | +| [OMID-197](https://issues.apache.org/jira/browse/OMID-197) | Replace Mockito timeout#never() with times(0) | Major | . | +| [OMID-196](https://issues.apache.org/jira/browse/OMID-196) | Add junit test dependency for modules having minicluster tests | Major | . | +| [OMID-194](https://issues.apache.org/jira/browse/OMID-194) | OmidTableManager cannot create commit and timestamp tables in kerberos cluster | Blocker | . | +| [OMID-188](https://issues.apache.org/jira/browse/OMID-188) | Fix "inconsistent module metadata found" when using hbase-2 | Major | . | +| [OMID-192](https://issues.apache.org/jira/browse/OMID-192) | fix missing jcommander dependency | Blocker | . | +| [OMID-191](https://issues.apache.org/jira/browse/OMID-191) | Fix missing executable permission because of MASSEMBLY-941 | Blocker | . | + + +### OTHER: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [OMID-208](https://issues.apache.org/jira/browse/OMID-208) | Pass additional options to omid.sh | Major | . | +| [OMID-226](https://issues.apache.org/jira/browse/OMID-226) | Migrate from mockito-all to mockito-core and clean up test dependencies | Major | . | +| [OMID-233](https://issues.apache.org/jira/browse/OMID-233) | Fix license check | Major | . | +| [OMID-227](https://issues.apache.org/jira/browse/OMID-227) | Upgrade jcommander | Minor | . | +| [OMID-228](https://issues.apache.org/jira/browse/OMID-228) | Upgrade snakeyaml | Minor | . | +| [OMID-219](https://issues.apache.org/jira/browse/OMID-219) | Update to phoenix-thirdparty 2.0 | Major | . | +| [OMID-218](https://issues.apache.org/jira/browse/OMID-218) | Update OWASP plugin to latest | Major | . | +| [OMID-214](https://is
[phoenix-omid] tag 1.1.0RC0 created (now 3b9e16b7)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to tag 1.1.0RC0 in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git at 3b9e16b7 (commit) This tag includes the following new commits: new 3b9e16b7 Preparing phoenix-omid release 1.1.0RC0; tagging and updates to CHANGES.md and RELEASENOTES.md The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[phoenix-omid] branch master updated (66f1f070 -> 3b9e16b7)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git from 66f1f070 OMID-226 Migrate from mockito-all to mockito-core and clean up test d… (#123) add 3b9e16b7 Preparing phoenix-omid release 1.1.0RC0; tagging and updates to CHANGES.md and RELEASENOTES.md No new revisions were added by this update. Summary of changes: CHANGES.md | 57 ++ RELEASENOTES.md| 50 benchmarks/pom.xml | 2 +- codahale-metrics/pom.xml | 2 +- commit-table/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- hbase-client/pom.xml | 2 +- hbase-commit-table/pom.xml | 2 +- hbase-common/pom.xml | 2 +- hbase-coprocessor/pom.xml | 2 +- hbase-tools/pom.xml| 2 +- metrics/pom.xml| 2 +- pom.xml| 2 +- statemachine/pom.xml | 2 +- timestamp-storage/pom.xml | 2 +- transaction-client/pom.xml | 2 +- tso-server/pom.xml | 2 +- 18 files changed, 123 insertions(+), 16 deletions(-)
[phoenix-omid] 01/01: Preparing phoenix-omid release 1.1.0RC0; tagging and updates to CHANGES.md and RELEASENOTES.md
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to tag 1.1.0RC0 in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git commit 3b9e16b7537adbc90a7403507fb8aabd8d1fab0c Author: Istvan Toth AuthorDate: Thu Oct 6 14:02:04 2022 + Preparing phoenix-omid release 1.1.0RC0; tagging and updates to CHANGES.md and RELEASENOTES.md --- CHANGES.md | 57 ++ RELEASENOTES.md| 50 benchmarks/pom.xml | 2 +- codahale-metrics/pom.xml | 2 +- commit-table/pom.xml | 2 +- common/pom.xml | 2 +- examples/pom.xml | 2 +- hbase-client/pom.xml | 2 +- hbase-commit-table/pom.xml | 2 +- hbase-common/pom.xml | 2 +- hbase-coprocessor/pom.xml | 2 +- hbase-tools/pom.xml| 2 +- metrics/pom.xml| 2 +- pom.xml| 2 +- statemachine/pom.xml | 2 +- timestamp-storage/pom.xml | 2 +- transaction-client/pom.xml | 2 +- tso-server/pom.xml | 2 +- 18 files changed, 123 insertions(+), 16 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 3d78ce62..fcf61946 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,6 +18,63 @@ --> # OMID Changelog +## Release 1.1.0 - Unreleased (as of 2022-10-06) + + + +### IMPROVEMENTS: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [OMID-231](https://issues.apache.org/jira/browse/OMID-231) | Build and test Omid with Hadoop 3 | Major | . | +| [OMID-232](https://issues.apache.org/jira/browse/OMID-232) | Do not depend on netty-all | Major | . | +| [OMID-223](https://issues.apache.org/jira/browse/OMID-223) | Refactor Omid to use HBase 2 APIs internally | Major | . | +| [OMID-222](https://issues.apache.org/jira/browse/OMID-222) | Remove HBase1 support and update HBase 2 version to 2.4 | Major | . | +| [OMID-221](https://issues.apache.org/jira/browse/OMID-221) | Bump junit from 4.13 to 4.13.1 | Major | . | +| [OMID-220](https://issues.apache.org/jira/browse/OMID-220) | Update netty to 4.1.76.Final | Major | . | +| [OMID-209](https://issues.apache.org/jira/browse/OMID-209) | Migrate to commons-lang3 | Major | . | +| [OMID-202](https://issues.apache.org/jira/browse/OMID-202) | Refactor Omid to use Netty 4 | Major | . | + + +### BUG FIXES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [OMID-189](https://issues.apache.org/jira/browse/OMID-189) | Fix RAT check errors | Major | . | +| [OMID-230](https://issues.apache.org/jira/browse/OMID-230) | Update Netty and commons-io versions | Major | . | +| [OMID-229](https://issues.apache.org/jira/browse/OMID-229) | Allow only "squash and merge" from GitHub UI | Major | . | +| [OMID-224](https://issues.apache.org/jira/browse/OMID-224) | Switch default logging backend to log4j2 | Major | . | +| [OMID-216](https://issues.apache.org/jira/browse/OMID-216) | Remove log4j.properties from maven artifact | Major | . | +| [OMID-211](https://issues.apache.org/jira/browse/OMID-211) | HBase Shims leak testing dependencies as compile dependencies. | Major | . | +| [OMID-210](https://issues.apache.org/jira/browse/OMID-210) | Build failure on Linux ARM64 | Major | . | +| [OMID-198](https://issues.apache.org/jira/browse/OMID-198) | Replace static ports used for TSO server with random ports in the tests | Major | . | +| [OMID-200](https://issues.apache.org/jira/browse/OMID-200) | Omid client cannot use kerberos cache when using proxyUser | Blocker | . | +| [OMID-199](https://issues.apache.org/jira/browse/OMID-199) | Omid client cannot use pre-authenticated UserGroupInformation.getCurrentUser() | Blocker | . | +| [OMID-197](https://issues.apache.org/jira/browse/OMID-197) | Replace Mockito timeout#never() with times(0) | Major | . | +| [OMID-196](https://issues.apache.org/jira/browse/OMID-196) | Add junit test dependency for modules having minicluster tests | Major | . | +| [OMID-194](https://issues.apache.org/jira/browse/OMID-194) | OmidTableManager cannot create commit and timestamp tables in kerberos cluster | Blocker | . | +| [OMID-188](https://issues.apache.org/jira/browse/OMID-188) | Fix "inconsistent module metadata found" when using hbase-2 | Major | . | +| [OMID-192](https://issues.apache.org/jira/browse/OMID-192) | fix missing jcommander dependency | Blocker | . | +| [OMID-191](https://issues.apache.org/jira/browse/OMID-191) | Fix missing executable permission because of MASSEMBLY-941 | Blocker | . | + + +### OTHER: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [OMID-208](https://issues.apache.org/jira/browse/OMID-208) | Pass additional options to omid.sh | Major | . | +| [OMID-226](https://issues.apache.org/jira/browse/OMID-226) | Migrate from mockito-all to mockito-core and clean up test dependencies | Major |
[phoenix] branch master updated: PHOENIX-6805 Update release scripts for Omid 1.1.0
This is an automated email from the ASF dual-hosted git repository.
stoty 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 353cefa1fd PHOENIX-6805 Update release scripts for Omid 1.1.0
353cefa1fd is described below
commit 353cefa1fdffb1cddc623483108ecd54ecb6fefa
Author: Istvan Toth
AuthorDate: Wed Oct 5 15:52:49 2022 +0200
PHOENIX-6805 Update release scripts for Omid 1.1.0
---
dev/create-release/release-util.sh | 39 +++---
1 file changed, 24 insertions(+), 15 deletions(-)
diff --git a/dev/create-release/release-util.sh
b/dev/create-release/release-util.sh
index 5663c1b523..4b199132fb 100755
--- a/dev/create-release/release-util.sh
+++ b/dev/create-release/release-util.sh
@@ -25,7 +25,6 @@ if [ -n "${GPG_KEY}" ]; then
fi
# Maven Profiles for publishing snapshots and release to Maven Central and Dist
PUBLISH_PROFILES=("-P" "apache-release,release")
-OMID_VARIANTS=( "-Phbase-1" "-Phbase-2" )
set -e
@@ -589,6 +588,9 @@ make_binary_release() {
if [[ "$project" == "phoenix" ]]; then
rebuild_hbase_2
local profiles=( $(maven_get_hbase_profiles) )
+ elif [[ "$project" == "phoenix-omid" ]]; then
+rebuild_hbase_for_omid
+local profiles=( "" )
else
local profiles=( "" )
fi
@@ -641,18 +643,8 @@ function kick_gpg_agent {
# Do maven command to set version into local pom
function maven_set_version { #input:
local this_version="$1"
- # Omid needs an hbase profile for tagging (doesn't matter which one, the
shims need special handling anyway)
- if [[ "$PROJECT" == "phoenix-omid" ]]; then
-local variant="${OMID_VARIANTS[1]}"
- fi
- echo "${MVN[@]}" ${variant:+"$variant"} versions:set
-DnewVersion="$this_version"
- "${MVN[@]}" ${variant:+"$variant"} versions:set -DnewVersion="$this_version"
| grep -v "no value" # silence logs
- #Omid has an even more nonstandard maven structure, and needs more hacks
- for i in hbase-shims/hbase-*; do
-if [ -e "$i" ]; then
- sed -i -e
"0,\#.*#{s##${this_version}#}" $i/pom.xml
-fi
- done
+ echo "${MVN[@]}" versions:set -DnewVersion="$this_version"
+ "${MVN[@]}" versions:set -DnewVersion="$this_version" | grep -v "no value" #
silence logs
}
# Do maven command to read version from local pom
@@ -672,6 +664,11 @@ function maven_get_hbase_version_from_profile {
"${MVN[@]}" -q -N -Dexec.executable="echo"
-Dexec.args='${hbase-'"$profile"'.runtime.version}' exec:exec
}
+function maven_get_omid_hbase_version {
+ # shellcheck disable=SC2016
+ "${MVN[@]}" -q -N -Dexec.executable="echo" -Dexec.args='${hbase.version}'
exec:exec
+}
+
# Do maven deploy to snapshot or release artifact repository, with checks.
function maven_deploy { #inputs:
local timing_token
@@ -704,9 +701,9 @@ function maven_deploy { #inputs:
DRY_DEPLOY_DIR="${BASE_DIR}/${PROJECT}.deploy"
dry_deploy="-DaltDeploymentRepository=dryrun::default::file://${DRY_DEPLOY_DIR}"
fi
- # Omid needs to be deployed twice for HBase 1 and 2
if [[ "$PROJECT" == "phoenix-omid" ]]; then
-local variants=( "${OMID_VARIANTS[@]}" )
+rebuild_hbase_for_omid
+local variants=( "" )
elif [[ "$PROJECT" == "phoenix" ]]; then
rebuild_hbase_2
local profiles=( $(maven_get_hbase_profiles) )
@@ -759,6 +756,18 @@ function rebuild_hbase_2() {
HBASE_ALREADY_REBUILT="yes"
}
+function rebuild_hbase_for_omid() {
+ if [[ "yes" == "$HBASE_OMID_ALREADY_REBUILT" ]]; then
+ return 0
+ fi
+ local hbase_runtime_version=$(maven_get_omid_hbase_version)
+ if [[ $hbase_runtime_version == 2* ]]; then
+rebuild_hbase_locally "$hbase_runtime_version"
+ fi
+ HBASE_OMID_ALREADY_REBUILT="yes"
+}
+
+
function rebuild_hbase_locally() {
local hbase_version="$1"
MAVEN_SETTINGS_FILE="$MAVEN_SETTINGS_FILE" "$SELF"/rebuild_hbase.sh
"$hbase_version"
[phoenix] branch 5.1 updated: PHOENIX-5894 Table versus Table Full Outer join on Salted tables not … (#1395)
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new 8f0bade551 PHOENIX-5894 Table versus Table Full Outer join on Salted
tables not … (#1395)
8f0bade551 is described below
commit 8f0bade5518f188b296073c8917a0b4a2846c877
Author: Rajeshbabu Chintaguntla
AuthorDate: Thu Feb 17 11:43:34 2022 +0530
PHOENIX-5894 Table versus Table Full Outer join on Salted tables not …
(#1395)
PHOENIX-5894 Table versus Table Full Outer join on Salted tables not working
Co-authored-by: Rajeshbabu Chintaguntla
---
.../phoenix/end2end/join/HashJoinMoreIT.java | 55 --
.../org/apache/phoenix/compile/JoinCompiler.java | 12 +++--
2 files changed, 58 insertions(+), 9 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java
index ace4025b2d..226e0e3ae1 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java
@@ -21,21 +21,18 @@ 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.Assert.fail;
+import static org.junit.Assert.assertNull;
import java.sql.Array;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.SQLFeatureNotSupportedException;
import java.sql.Statement;
import java.util.Properties;
-import org.apache.phoenix.compile.QueryPlan;
import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
-import org.apache.phoenix.execute.HashJoinPlan;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.TestUtil;
@@ -437,6 +434,56 @@ public class HashJoinMoreIT extends
ParallelStatsDisabledIT {
}
}
+@Test
+public void testFullJoinOnSaltedTables() throws Exception {
+String tempTable1 = generateUniqueName();
+String tempTable2 = generateUniqueName();
+
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+try {
+conn.createStatement().execute("CREATE TABLE "+ tempTable1 + "(" +
+" PRODUCT_ID VARCHAR NOT NULL," +
+" PRODUCT_NAME VARCHAR NOT NULL," +
+" SUPPLIER_ID VARCHAR," +
+" CATEGORY_ID VARCHAR," +
+" CONSTRAINT PRODUCTS_NEW_PK PRIMARY KEY
(PRODUCT_ID,PRODUCT_NAME)) " +
+" DEFAULT_COLUMN_FAMILY='CF',COLUMN_ENCODED_BYTES=1,
SALT_BUCKETS = 2");
+conn.createStatement().execute("CREATE TABLE "+ tempTable2+" (" +
+" ORDER_ID VARCHAR NOT NULL," +
+" PRODUCT_ID VARCHAR NOT NULL," +
+" UNIT_PRICE VARCHAR," +
+" CONSTRAINT ORDER_DETAILS_NEW_PK PRIMARY KEY
(ORDER_ID,PRODUCT_ID))" +
+" DEFAULT_COLUMN_FAMILY='CF',COLUMN_ENCODED_BYTES=1,
SALT_BUCKETS = 2");
+Statement statement = conn.createStatement();
+statement.execute("UPSERT INTO "+tempTable1+" values ( '1',
'Chai', '8', '1')");
+statement.execute("UPSERT INTO "+tempTable1+" values ( '11',
'Queso Cabrales', '5', '4')");
+statement.execute("UPSERT INTO "+tempTable2+" values ( '10248',
'11', '14')");
+statement.execute("UPSERT INTO "+tempTable2+" values ( '10248',
'42', '9.8')");
+statement.execute("UPSERT INTO "+tempTable2+" values ( '10249',
'14', '18.6')");
+conn.commit();
+ResultSet rs = statement.executeQuery("SELECT PROD.PRODUCT_ID,
OD.ORDER_ID" +
+" FROM "+tempTable1+" PROD" +
+" FULL OUTER JOIN "+ tempTable2+" OD ON
PROD.PRODUCT_ID=OD.PRODUCT_ID" +
+" ORDER BY PROD.PRODUCT_ID");
+assertTrue(rs.next());
+assertEquals("1", rs.getString(1));
+assertNull(rs.getString(2));
+assertTrue(rs.next());
+assertEquals("11",rs.getString(1));
+assertEquals(rs.getString(2
[phoenix] branch 5.1 updated: PHOENIX-6773 PhoenixDatabaseMetadata.getColumns() always returns null COLUMN_DEF
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new 5451ce0e88 PHOENIX-6773 PhoenixDatabaseMetadata.getColumns() always
returns null COLUMN_DEF
5451ce0e88 is described below
commit 5451ce0e88ec46597bed3fed18951e7260e67e31
Author: Aron Meszaros
AuthorDate: Wed Sep 21 10:07:10 2022 +0200
PHOENIX-6773 PhoenixDatabaseMetadata.getColumns() always returns null
COLUMN_DEF
---
.../it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java | 4 +++-
.../main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java| 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index de50b35a7d..7ab175c3be 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -92,7 +92,7 @@ public class QueryDatabaseMetaDataIT extends
ParallelStatsDisabledIT {
throws SQLException {
String ddl =
"create table if not exists " + tableName + " (id char(1)
primary key,\n"
-+ "a.col1 integer,\n" + "b.col2 bigint,\n" + "
b.col3 decimal,\n"
++ "a.col1 integer default 42,\n" + "b.col2
bigint,\n" + "b.col3 decimal,\n"
+ "b.col4 decimal(5),\n" + "b.col5
decimal(6,3))\n" + "a."
+ HConstants.VERSIONS + "=" + 1 + "," + "a."
+ ColumnFamilyDescriptorBuilder.DATA_BLOCK_ENCODING +
"='" + DataBlockEncoding.NONE
@@ -477,6 +477,7 @@ public class QueryDatabaseMetaDataIT extends
ParallelStatsDisabledIT {
assertEquals(table, rs.getString("TABLE_NAME"));
assertEquals(SchemaUtil.normalizeIdentifier("a"),
rs.getString("COLUMN_FAMILY"));
assertEquals(SchemaUtil.normalizeIdentifier("col1"),
rs.getString("COLUMN_NAME"));
+assertEquals("42", rs.getString("COLUMN_DEF"));
assertEquals(DatabaseMetaData.attributeNullable,
rs.getShort("NULLABLE"));
assertEquals(PInteger.INSTANCE.getSqlType(), rs.getInt("DATA_TYPE"));
assertEquals(2, rs.getInt("ORDINAL_POSITION"));
@@ -490,6 +491,7 @@ public class QueryDatabaseMetaDataIT extends
ParallelStatsDisabledIT {
assertEquals(table, rs.getString("TABLE_NAME"));
assertEquals(SchemaUtil.normalizeIdentifier("b"),
rs.getString("COLUMN_FAMILY"));
assertEquals(SchemaUtil.normalizeIdentifier("col2"),
rs.getString("COLUMN_NAME"));
+assertEquals(null, rs.getString("COLUMN_DEF"));
assertEquals(DatabaseMetaData.attributeNullable,
rs.getShort("NULLABLE"));
assertEquals(PLong.INSTANCE.getSqlType(), rs.getInt("DATA_TYPE"));
assertEquals(3, rs.getInt("ORDINAL_POSITION"));
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
index 4866d4050b..abd553e922 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
@@ -821,7 +821,8 @@ public class PhoenixDatabaseMetaData implements
DatabaseMetaData {
cells.add(
PhoenixKeyValueUtil.newKeyValue(rowKey, TABLE_FAMILY_BYTES,
Bytes.toBytes(COLUMN_DEF),
-MetaDataProtocol.MIN_TABLE_TIMESTAMP,
ByteUtil.EMPTY_BYTE_ARRAY));
+MetaDataProtocol.MIN_TABLE_TIMESTAMP,
+PVarchar.INSTANCE.toBytes(column.getExpressionStr(;
// SQL_DATA_TYPE
cells.add(PhoenixKeyValueUtil.newKeyValue(rowKey,
TABLE_FAMILY_BYTES,
Bytes.toBytes(SQL_DATA_TYPE),
MetaDataProtocol.MIN_TABLE_TIMESTAMP,
[phoenix] branch master updated: PHOENIX-6773 PhoenixDatabaseMetadata.getColumns() always returns null COLUMN_DEF
This is an automated email from the ASF dual-hosted git repository.
stoty 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 0c2008ddf3 PHOENIX-6773 PhoenixDatabaseMetadata.getColumns() always
returns null COLUMN_DEF
0c2008ddf3 is described below
commit 0c2008ddf32566c525df26cb94d60be32acc10da
Author: Aron Meszaros
AuthorDate: Wed Sep 21 10:07:10 2022 +0200
PHOENIX-6773 PhoenixDatabaseMetadata.getColumns() always returns null
COLUMN_DEF
---
.../it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java | 4 +++-
.../main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java| 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index 6756dbf5bf..cc5b3d511f 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -92,7 +92,7 @@ public class QueryDatabaseMetaDataIT extends
ParallelStatsDisabledIT {
throws SQLException {
String ddl =
"create table if not exists " + tableName + " (id char(1)
primary key,\n"
-+ "a.col1 integer,\n" + "b.col2 bigint,\n" + "
b.col3 decimal,\n"
++ "a.col1 integer default 42,\n" + "b.col2
bigint,\n" + "b.col3 decimal,\n"
+ "b.col4 decimal(5),\n" + "b.col5
decimal(6,3))\n" + "a."
+ HConstants.VERSIONS + "=" + 1 + "," + "a."
+ ColumnFamilyDescriptorBuilder.DATA_BLOCK_ENCODING +
"='" + DataBlockEncoding.NONE
@@ -481,6 +481,7 @@ public class QueryDatabaseMetaDataIT extends
ParallelStatsDisabledIT {
assertEquals(table, rs.getString("TABLE_NAME"));
assertEquals(SchemaUtil.normalizeIdentifier("a"),
rs.getString("COLUMN_FAMILY"));
assertEquals(SchemaUtil.normalizeIdentifier("col1"),
rs.getString("COLUMN_NAME"));
+assertEquals("42", rs.getString("COLUMN_DEF"));
assertEquals(DatabaseMetaData.attributeNullable,
rs.getShort("NULLABLE"));
assertEquals(PInteger.INSTANCE.getSqlType(), rs.getInt("DATA_TYPE"));
assertEquals(2, rs.getInt("ORDINAL_POSITION"));
@@ -494,6 +495,7 @@ public class QueryDatabaseMetaDataIT extends
ParallelStatsDisabledIT {
assertEquals(table, rs.getString("TABLE_NAME"));
assertEquals(SchemaUtil.normalizeIdentifier("b"),
rs.getString("COLUMN_FAMILY"));
assertEquals(SchemaUtil.normalizeIdentifier("col2"),
rs.getString("COLUMN_NAME"));
+assertEquals(null, rs.getString("COLUMN_DEF"));
assertEquals(DatabaseMetaData.attributeNullable,
rs.getShort("NULLABLE"));
assertEquals(PLong.INSTANCE.getSqlType(), rs.getInt("DATA_TYPE"));
assertEquals(3, rs.getInt("ORDINAL_POSITION"));
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
index b345ae6ceb..478a0aa874 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
@@ -852,7 +852,8 @@ public class PhoenixDatabaseMetaData implements
DatabaseMetaData {
cells.add(
PhoenixKeyValueUtil.newKeyValue(rowKey, TABLE_FAMILY_BYTES,
Bytes.toBytes(COLUMN_DEF),
-MetaDataProtocol.MIN_TABLE_TIMESTAMP,
ByteUtil.EMPTY_BYTE_ARRAY));
+MetaDataProtocol.MIN_TABLE_TIMESTAMP,
+PVarchar.INSTANCE.toBytes(column.getExpressionStr(;
// SQL_DATA_TYPE
cells.add(PhoenixKeyValueUtil.newKeyValue(rowKey,
TABLE_FAMILY_BYTES,
Bytes.toBytes(SQL_DATA_TYPE),
MetaDataProtocol.MIN_TABLE_TIMESTAMP,
[phoenix] branch master updated: PHOENIX-6789 Remove com.sun.istack.NotNull usage
This is an automated email from the ASF dual-hosted git repository.
stoty 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 aac9acd395 PHOENIX-6789 Remove com.sun.istack.NotNull usage
aac9acd395 is described below
commit aac9acd3956a627cc2814d95c7dcc2c5b97e8268
Author: Istvan Toth
AuthorDate: Wed Sep 14 15:29:43 2022 +0200
PHOENIX-6789 Remove com.sun.istack.NotNull usage
---
.../java/org/apache/phoenix/jdbc/HighAvailabilityGroup.java | 5 +++--
pom.xml | 11 +++
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/HighAvailabilityGroup.java
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/HighAvailabilityGroup.java
index 1281b7b54d..9a0eefd547 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/HighAvailabilityGroup.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/HighAvailabilityGroup.java
@@ -17,7 +17,6 @@
*/
package org.apache.phoenix.jdbc;
-import com.sun.istack.NotNull;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -43,6 +42,8 @@ import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import edu.umd.cs.findbugs.annotations.NonNull;
+
import java.io.IOException;
import java.sql.Connection;
import java.sql.Driver;
@@ -651,7 +652,7 @@ public class HighAvailabilityGroup {
* @param newRoleRecord the new cluster role record to set
* @return true if the new record is set as current one; false otherwise
*/
-private synchronized boolean applyClusterRoleRecord(@NotNull
ClusterRoleRecord newRoleRecord) {
+private synchronized boolean applyClusterRoleRecord(@NonNull
ClusterRoleRecord newRoleRecord) {
if (roleRecord == null) {
roleRecord = newRoleRecord;
state = State.READY;
diff --git a/pom.xml b/pom.xml
index 7fea95b3a8..4dcf5666b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -404,10 +404,6 @@
dnsjava:dnsjava
-
-
- com.sun.istack:istack-commons-runtime
-
@@ -506,6 +502,13 @@
org.apache.commons.lang.**
+
+true
+Use edu.umd.cs.findbugs.annotations
+
+ com.sun.istack.**
+
+
[phoenix] branch master updated: PHOENIX-6692 Add HBase 2.5 support (addendum: fix maven-dependecy-plugin check error with 2.5)
This is an automated email from the ASF dual-hosted git repository. stoty 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 27319b271f PHOENIX-6692 Add HBase 2.5 support (addendum: fix maven-dependecy-plugin check error with 2.5) 27319b271f is described below commit 27319b271ff1d41856c314235b3509c0b839a345 Author: Istvan Toth AuthorDate: Wed Sep 14 15:24:02 2022 +0200 PHOENIX-6692 Add HBase 2.5 support (addendum: fix maven-dependecy-plugin check error with 2.5) --- pom.xml | 8 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index 779ac502cc..7fea95b3a8 100644 --- a/pom.xml +++ b/pom.xml @@ -395,11 +395,19 @@ org.apache.logging.log4j:log4j-core + + + com.sun.xml.bind:jaxb-impl + dnsjava:dnsjava + + + com.sun.istack:istack-commons-runtime +
[phoenix] branch master updated: PHOENIX-6764 Implement Binary and Hexadecimal literals
This is an automated email from the ASF dual-hosted git repository.
stoty 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 11f8e3c200 PHOENIX-6764 Implement Binary and Hexadecimal literals
11f8e3c200 is described below
commit 11f8e3c20068b3e62482f6b3cdd0214915767636
Author: Istvan Toth
AuthorDate: Fri Aug 19 13:00:55 2022 +0200
PHOENIX-6764 Implement Binary and Hexadecimal literals
also changes to how binary types are converted to String in ResultSets and
explain results
---
.../end2end/BaseTenantSpecificViewIndexIT.java | 6 +-
.../phoenix/end2end/BinaryStringLiteralIT.java | 142 +
.../phoenix/end2end/RowValueConstructorIT.java | 2 +-
.../phoenix/end2end/SortMergeJoinMoreIT.java | 8 +-
.../org/apache/phoenix/end2end/UpsertSelectIT.java | 2 +-
.../it/java/org/apache/phoenix/end2end/ViewIT.java | 11 +-
.../phoenix/end2end/index/SaltedIndexIT.java | 13 +-
.../phoenix/end2end/join/HashJoinMoreIT.java | 8 +-
phoenix-core/src/main/antlr3/PhoenixSQL.g | 77 ++-
.../org/apache/phoenix/jdbc/PhoenixConnection.java | 3 +
.../org/apache/phoenix/parse/ParseNodeFactory.java | 44 ++-
.../phoenix/schema/types/PArrayDataType.java | 2 +-
.../org/apache/phoenix/schema/types/PBinary.java | 3 -
.../apache/phoenix/schema/types/PVarbinary.java| 10 +-
.../java/org/apache/phoenix/util/ByteUtil.java | 50 +++-
.../apache/phoenix/compile/WhereOptimizerTest.java | 13 +-
.../org/apache/phoenix/parse/QueryParserTest.java | 54
.../org/apache/phoenix/query/QueryPlanTest.java| 4 +-
18 files changed, 402 insertions(+), 50 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
index fdce1c4b87..92eef8ef3d 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificViewIndexIT.java
@@ -33,6 +33,7 @@ import org.apache.hadoop.hbase.util.Pair;
import org.apache.phoenix.compile.ExplainPlan;
import org.apache.phoenix.compile.ExplainPlanAttributes;
import org.apache.phoenix.jdbc.PhoenixPreparedStatement;
+import org.apache.phoenix.schema.types.PVarbinary;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.SchemaUtil;
@@ -169,9 +170,10 @@ public abstract class BaseTenantSpecificViewIndexIT
extends SplitSystemCatalogIT
} else {
iteratorTypeAndScanSize = "PARALLEL 3-WAY";
clientSortAlgo = "CLIENT MERGE SORT";
-keyRanges = " [0," + (Short.MIN_VALUE + expectedIndexIdOffset)
+keyRanges = " [X'00'," + (Short.MIN_VALUE +
expectedIndexIdOffset)
+ ",'" + tenantId + "','" + valuePrefix + "v2-1'] - ["
-+ (saltBuckets - 1) + "," + (Short.MIN_VALUE +
expectedIndexIdOffset)
++ PVarbinary.INSTANCE.toStringLiteral(new byte[]
{(byte)(saltBuckets - 1)})
++ "," + (Short.MIN_VALUE + expectedIndexIdOffset)
+ ",'" + tenantId + "','" + valuePrefix + "v2-1']";
}
expectedTableName = "_IDX_" + tableName;
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryStringLiteralIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryStringLiteralIT.java
new file mode 100644
index 00..a6632166d8
--- /dev/null
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BinaryStringLiteralIT.java
@@ -0,0 +1,142 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.sql.Connection;
+imp
[phoenix] branch master updated: PHOENIX-6692 Add HBase 2.5 support
This is an automated email from the ASF dual-hosted git repository.
stoty 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 8c2b410e36 PHOENIX-6692 Add HBase 2.5 support
8c2b410e36 is described below
commit 8c2b410e36cf95a918e8fad9f63e6cd0d67f8abe
Author: Istvan Toth
AuthorDate: Mon Apr 25 15:27:15 2022 +0200
PHOENIX-6692 Add HBase 2.5 support
---
Jenkinsfile| 2 +-
phoenix-core/pom.xml | 3 +
.../end2end/index/MutableIndexExtendedIT.java | 18 +++-
.../it/resources/compatible_client_versions.json | 5 +-
.../hadoop/hbase/ipc/PhoenixRpcScheduler.java | 2 +-
.../schema/tool/SchemaExtractionProcessor.java | 9 +-
.../java/org/apache/phoenix/util/TestUtil.java | 19 +++-
.../compat/hbase/CompatPhoenixRpcScheduler.java| 11 ++
.../apache/phoenix/compat/hbase/CompatUtil.java| 12 ---
.../compat/hbase/HbaseCompatCapabilities.java | 8 +-
.../compat/hbase/CompatPhoenixRpcScheduler.java| 11 ++
.../apache/phoenix/compat/hbase/CompatUtil.java| 12 ---
.../compat/hbase/HbaseCompatCapabilities.java | 8 +-
.../compat/hbase/CompatPhoenixRpcScheduler.java| 12 +++
.../apache/phoenix/compat/hbase/CompatUtil.java| 13 ---
.../compat/hbase/HbaseCompatCapabilities.java | 8 +-
phoenix-hbase-compat-2.5.0/pom.xml | 113 +
.../phoenix/compat/hbase/CompatDelegateHTable.java | 31 --
.../compat/hbase/CompatOmidTransactionTable.java | 25 +++--
.../compat/hbase/CompatPhoenixRpcScheduler.java| 17 +++-
.../compat/hbase/CompatSteppingSplitPolicy.java| 8 +-
.../apache/phoenix/compat/hbase/CompatUtil.java| 13 ---
.../compat/hbase/HbaseCompatCapabilities.java | 8 +-
pom.xml| 61 ++-
24 files changed, 299 insertions(+), 130 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index aa098ba604..2a6a393a43 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
axes {
axis {
name 'HBASE_PROFILE'
-values '2.3', '2.4'
+values '2.3', '2.4', '2.5'
}
}
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index cf410b3384..f162aa8128 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -65,6 +65,9 @@
|| ("${hbase.compat.version}".equals("2.4.1")
hbaseMinor == 4
hbasePatch =1)
+|| ("${hbase.compat.version}".equals("2.5.0")
+ hbaseMinor == 5
+ hbasePatch =0)
)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexExtendedIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexExtendedIT.java
index f7aa1b45a2..4987c6e776 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexExtendedIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexExtendedIT.java
@@ -21,6 +21,9 @@ import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.*;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.HStore;
+import org.apache.hadoop.hbase.regionserver.compactions.CompactionContext;
+import
org.apache.hadoop.hbase.regionserver.compactions.CompactionLifeCycleTracker;
+import
org.apache.hadoop.hbase.regionserver.throttle.NoLimitThroughputController;
import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
@@ -49,6 +52,7 @@ import java.sql.Connection;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+import java.util.Optional;
import java.util.Properties;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
@@ -125,8 +129,13 @@ public class MutableIndexExtendedIT extends
ParallelStatsDisabledIT {
HRegion hRegion = regions.get(0);
hRegion.flush(true);
HStore store = hRegion.getStore(famBytes);
+// Trigger major compaction
store.triggerMajorCompaction();
-store.compactRecentForTestingAssumingDefaultPolicy(1);
+Optional requestCompaction =
+
store.requestCompaction(org.apache.hadoop.hbase.regionserver.Store.PRIORITY_USER,
+CompactionLifeCycleTracker.DUMMY, null);
+store.compact(requestCompaction.get(),
NoLimitThroughputController.INSTANCE, null);
+assertEquals(1, store.getStorefiles().size
[phoenix-omid] branch master updated: OMID-231 Build and test Omid with Hadoop 3
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git
The following commit(s) were added to refs/heads/master by this push:
new 41cf1935 OMID-231 Build and test Omid with Hadoop 3
41cf1935 is described below
commit 41cf193570e97e065ee159f297ed9b85d34d3880
Author: Istvan Toth
AuthorDate: Mon Aug 29 10:49:15 2022 +0200
OMID-231 Build and test Omid with Hadoop 3
---
.gitignore | 3 +
.travis.yml | 2 +
dev-support/cache-apache-project-artifact.sh | 142 +++
dev-support/rebuild_hbase.sh | 77 +++
pom.xml | 39 +---
5 files changed, 249 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index 84db5847..2741304c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,9 @@ lib/
*.iws
*~
*.swp
+/dev-support/artifacts/**
+/dev-support/work/**
+
# Generated website files
generated-website/
diff --git a/.travis.yml b/.travis.yml
index b19f9a19..4d81466f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,5 +38,7 @@ script:
else
git checkout -b tmp-build-branch
&&
+ dev-support/rebuild_hbase.sh detect
+ &&
mvn clean test ;
fi
\ No newline at end of file
diff --git a/dev-support/cache-apache-project-artifact.sh
b/dev-support/cache-apache-project-artifact.sh
new file mode 100755
index ..21c1d869
--- /dev/null
+++ b/dev-support/cache-apache-project-artifact.sh
@@ -0,0 +1,142 @@
+#!/usr/bin/env bash
+#
+# 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.
+#
+
+# This was lovingly copied from Apache HBase
+
+set -e
+function usage {
+ echo "Usage: ${0} [options] /path/to/download/file.tar.gz
download/fragment/eg/project/subdir/some-artifact-version.tar.gz"
+ echo ""
+ echo "--force for a redownload even if
/path/to/download/file.tar.gz exists."
+ echo "--working-dir /path/to/usePath for writing tempfiles. must
exist."
+ echo " defaults to making a directory via
mktemp that we clean."
+ echo "--keys url://to/project/KEYS where to get KEYS. needed to check
signature on download."
+ echo ""
+ exit 1
+}
+# if no args specified, show usage
+if [ $# -lt 2 ]; then
+ usage
+fi
+
+
+# Get arguments
+declare done_if_cached="true"
+declare working_dir
+declare cleanup="true"
+declare keys
+while [ $# -gt 0 ]
+do
+ case "$1" in
+--force) shift; done_if_cached="false";;
+--working-dir) shift; working_dir=$1; cleanup="false"; shift;;
+--keys) shift; keys=$1; shift;;
+--) shift; break;;
+-*) usage ;;
+*) break;; # terminate while loop
+ esac
+done
+
+# should still have required args
+if [ $# -lt 2 ]; then
+ usage
+fi
+
+target="$1"
+artifact="$2"
+
+if [ -f "${target}" ] && [ "true" = "${done_if_cached}" ]; then
+ echo "Reusing existing download of '${artifact}'."
+ exit 0
+fi
+
+if [ -z "${working_dir}" ]; then
+ if ! working_dir="$(mktemp -d -t hbase-download-apache-artifact)" ; then
+echo "Failed to create temporary working directory. Please specify via
--working-dir" >&2
+exit 1
+ fi
+else
+ # absolutes please
+ working_dir="$(cd "$(dirname "${working_dir}")"; pwd)/$(basename
"${working_dir}")"
+ if [ ! -d "${working_dir}" ]; then
+echo "passed working directory '${working_dir}' must already exist." >&2
+exit 1
+ fi
+fi
+
+function cleanup {
+ if [ -n "${keys}" ]; then
+echo "Stopping gpg agent daemon"
+gpgconf --homedir "${working_dir}/.gpg" --kill gpg-agent
+echo "Stopped gpg agent daemon"
+ fi
+
+ if [ "true" = "${cleanup}" ]; then
+echo "cleaning up temp space."
+rm -rf "${
[phoenix-omid] branch master updated: OMID-232 Do not depend on netty-all
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git
The following commit(s) were added to refs/heads/master by this push:
new 170a64d5 OMID-232 Do not depend on netty-all
170a64d5 is described below
commit 170a64d503d3ace4cc7500bd73e2863e2754748e
Author: Istvan Toth
AuthorDate: Mon Aug 29 14:10:39 2022 +0200
OMID-232 Do not depend on netty-all
---
pom.xml| 37 -
transaction-client/pom.xml | 10 +-
tso-server/pom.xml | 10 +-
3 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 040839b9..38e41b6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -966,11 +966,46 @@
${curator.version}
+
io.netty
-netty-all
+netty-transport
${netty4.version}
+
+io.netty
+netty-common
+${netty4.version}
+
+
+io.netty
+netty-codec
+${netty4.version}
+
+
+
+
+io.netty
+netty-buffer
+${netty4.version}
+
+
+io.netty
+netty-handler
+${netty4.version}
+
+
+io.netty
+netty-transport-native-epoll
+${netty4.version}
+
+
+io.netty
+netty-transport-native-unix-common
+${netty4.version}
+
+
+
org.slf4j
diff --git a/transaction-client/pom.xml b/transaction-client/pom.xml
index 248a05e7..2f4b2ee8 100644
--- a/transaction-client/pom.xml
+++ b/transaction-client/pom.xml
@@ -68,7 +68,15 @@
io.netty
-netty-all
+netty-transport
+
+
+io.netty
+netty-common
+
+
+io.netty
+netty-codec
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index 009369fc..44452805 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -111,7 +111,15 @@
io.netty
-netty-all
+netty-transport
+
+
+io.netty
+netty-common
+
+
+io.netty
+netty-codec
com.google.protobuf
[phoenix-omid] branch master updated: OMID-223 Refactor Omid to use HBase 2 APIs internally
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git
The following commit(s) were added to refs/heads/master by this push:
new e1bceec8 OMID-223 Refactor Omid to use HBase 2 APIs internally
e1bceec8 is described below
commit e1bceec8e21cf36f9393d6eda82dfee4a15ad9d9
Author: ameszaros
AuthorDate: Wed Jul 20 15:15:25 2022 +0200
OMID-223 Refactor Omid to use HBase 2 APIs internally
Co-authored-by: Istvan Toth
---
.../src/main/java/org/apache/omid/YAMLUtils.java | 3 -
.../omid/transaction/HBaseTransactionManager.java | 4 +-
.../omid/transaction/SnapshotFilterImpl.java | 6 +-
.../java/org/apache/omid/transaction/TTable.java | 22 +--
.../org/apache/omid/transaction/OmidTestBase.java | 35 ++
.../transaction/TestBaillisAnomaliesWithTXs.java | 18 ++---
.../omid/transaction/TestBasicTransaction.java | 28
.../apache/omid/transaction/TestCheckpoint.java| 10 +--
.../org/apache/omid/transaction/TestDeletion.java | 2 +-
.../transaction/TestEndToEndScenariosWithHA.java | 16 ++---
.../org/apache/omid/transaction/TestFilters.java | 6 +-
.../apache/omid/transaction/TestOmidLLRaces.java | 35 ++
.../apache/omid/transaction/TestShadowCells.java | 6 +-
.../omid/transaction/TestTTableBehaviour.java | 2 +-
.../omid/transaction/TestTransactionCleanup.java | 8 +--
.../omid/transaction/TestTransactionConflict.java | 42 +++-
.../apache/omid/transaction/TestTxMgrFailover.java | 10 +--
.../apache/omid/transaction/TestUpdateScan.java| 8 +--
.../omid/committable/hbase/HBaseCommitTable.java | 11 +++-
.../committable/hbase/TestHBaseCommitTable.java| 43 +++-
.../omid/committable/hbase/RegionSplitter.java | 2 +-
.../org/apache/omid/transaction/CellUtils.java | 4 +-
.../hbase/regionserver/CompactorScanner.java | 7 +-
.../omid/transaction/CellSkipFilterBase.java | 46 -
.../omid/transaction/OmidSnapshotFilter.java | 4 +-
.../TransactionVisibilityFilterBase.java | 28 ++--
.../apache/omid/transaction/TestCompaction.java| 37 +++
.../apache/omid/transaction/TestCompactionLL.java | 31 +
.../omid/transaction/TestCompactorScanner.java | 6 +-
.../omid/transaction/TestSnapshotFilter.java | 76 --
.../omid/transaction/TestSnapshotFilterLL.java | 36 ++
.../apache/omid/tools/hbase/OmidTableManager.java | 28 +---
.../omid/tools/hbase/TestOmidTableManager.java | 12 ++--
.../timestamp/storage/HBaseTimestampStorage.java | 6 +-
.../storage/TestHBaseTimestampStorage.java | 32 +
35 files changed, 405 insertions(+), 265 deletions(-)
diff --git a/common/src/main/java/org/apache/omid/YAMLUtils.java
b/common/src/main/java/org/apache/omid/YAMLUtils.java
index 7d0522be..d88d1a88 100644
--- a/common/src/main/java/org/apache/omid/YAMLUtils.java
+++ b/common/src/main/java/org/apache/omid/YAMLUtils.java
@@ -53,7 +53,6 @@ public class YAMLUtils {
}
}
-@SuppressWarnings("unchecked")
public Map loadSettings(String resourcePath, String defaultResourcePath)
throws IOException {
Map defaultSetting = loadAsMap(defaultResourcePath);
Preconditions.checkState(defaultSetting.size() > 0,
String.format("Failed to load file '%s' from classpath", defaultResourcePath));
@@ -64,7 +63,6 @@ public class YAMLUtils {
return defaultSetting;
}
-@SuppressWarnings("unchecked")
public Map loadAsMap(String path) throws IOException {
try {
String content = Resources.toString(Resources.getResource(path),
Charset.forName("UTF-8"));
@@ -75,7 +73,6 @@ public class YAMLUtils {
}
}
-@SuppressWarnings("unchecked")
public Map loadStringAsMap(String content) {
try {
Map settings = new Yaml().loadAs(content, Map.class);
diff --git
a/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java
b/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java
index ffc3850d..2226f969 100644
---
a/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java
+++
b/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java
@@ -295,8 +295,8 @@ public class HBaseTransactionManager extends
AbstractTransactionManager implemen
byte[] family = hBaseCellId.getFamily();
byte[] shadowCellQualifier =
CellUtils.addShadowCellSuffixPrefix(hBaseCellId.getQualifier());
get.addColumn(family, shadowCellQualifier);
-get.setMaxVersions(1);
-get.setTimeStamp(startTimestamp);
+get.readVersions(1);
+get.setTimestamp(startTimestamp);
[phoenix-omid] branch master updated: OMID-230 Update Netty and commons-io versions
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git
The following commit(s) were added to refs/heads/master by this push:
new c2db5faa OMID-230 Update Netty and commons-io versions
c2db5faa is described below
commit c2db5faabf5609dac07bf27f3db2e4926ad8f5d8
Author: Istvan Toth
AuthorDate: Wed Aug 17 15:59:01 2022 +0200
OMID-230 Update Netty and commons-io versions
commons-io: 2.11.0
netty: 4.1.79.Final
---
pom.xml| 12
transaction-client/pom.xml | 1 -
tso-server/pom.xml | 1 -
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9442b717..040839b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,6 @@
1.8
-2.11.0
UTF-8
@@ -160,7 +159,7 @@
6.10
1.7.36
2.18.0
-4.1.76.Final
+4.1.79.Final
com.google.protobuf
2.5.0
@@ -179,8 +178,7 @@
3.5.9
1.30
1.9.4
-
-2.6
+2.11.0
3.0.1
2.4.2
3.12.0
@@ -968,6 +966,12 @@
${curator.version}
+
+io.netty
+netty-all
+${netty4.version}
+
+
org.slf4j
slf4j-api
diff --git a/transaction-client/pom.xml b/transaction-client/pom.xml
index 6a455ab5..248a05e7 100644
--- a/transaction-client/pom.xml
+++ b/transaction-client/pom.xml
@@ -69,7 +69,6 @@
io.netty
netty-all
-${netty4.version}
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index 762427db..009369fc 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -112,7 +112,6 @@
io.netty
netty-all
-${netty4.version}
com.google.protobuf
[phoenix] branch 5.1 updated: PHOENIX-6771 Allow only "squash and merge" from GitHub UI
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new d0959a3362 PHOENIX-6771 Allow only "squash and merge" from GitHub UI d0959a3362 is described below commit d0959a3362a03fc8b9a75fd448038e5fb9278606 Author: Istvan Toth AuthorDate: Tue Aug 16 09:06:50 2022 +0200 PHOENIX-6771 Allow only "squash and merge" from GitHub UI --- .asf.yaml | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 22e3eab02d..2a9f642fa7 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -22,7 +22,13 @@ # changes with dev@ before committing. notifications: -commits: commits@phoenix.apache.org -issues: iss...@phoenix.apache.org -pullrequests: iss...@phoenix.apache.org -jira_options: link label comment + commits: commits@phoenix.apache.org + issues: iss...@phoenix.apache.org + pullrequests: iss...@phoenix.apache.org + jira_options: link label comment + +github: + enabled_merge_buttons: +squash: true +merge: false +rebase: false
[phoenix-queryserver] branch master updated (f7fd09d -> 0c1b57e)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git from f7fd09d PHOENIX-6762 Phoenix QueryServer cannot run correctly with python 3.8+ add 0c1b57e PHOENIX-6771 Allow only "squash and merge" from GitHub UI No new revisions were added by this update. Summary of changes: .../replace_jars_with_symlinks.sh => .asf.yaml | 35 +++--- 1 file changed, 18 insertions(+), 17 deletions(-) copy phoenix-queryserver-assembly/src/scripts/replace_jars_with_symlinks.sh => .asf.yaml (55%) mode change 100755 => 100644
[phoenix] branch master updated: PHOENIX-6771 Allow only "squash and merge" from GitHub UI
This is an automated email from the ASF dual-hosted git repository. stoty 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 2497b173bf PHOENIX-6771 Allow only "squash and merge" from GitHub UI 2497b173bf is described below commit 2497b173bf1aa8cee39cacba07fbbf006110f298 Author: Istvan Toth AuthorDate: Tue Aug 16 09:06:50 2022 +0200 PHOENIX-6771 Allow only "squash and merge" from GitHub UI --- .asf.yaml | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 22e3eab02d..2a9f642fa7 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -22,7 +22,13 @@ # changes with dev@ before committing. notifications: -commits: commits@phoenix.apache.org -issues: iss...@phoenix.apache.org -pullrequests: iss...@phoenix.apache.org -jira_options: link label comment + commits: commits@phoenix.apache.org + issues: iss...@phoenix.apache.org + pullrequests: iss...@phoenix.apache.org + jira_options: link label comment + +github: + enabled_merge_buttons: +squash: true +merge: false +rebase: false
[phoenix-thirdparty] branch master updated: PHOENIX-6771 Allow only "squash and merge" from GitHub UI
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-thirdparty.git The following commit(s) were added to refs/heads/master by this push: new fbfbabe PHOENIX-6771 Allow only "squash and merge" from GitHub UI fbfbabe is described below commit fbfbabed7415a00db00964298efc0314fb1c7136 Author: Istvan Toth AuthorDate: Tue Aug 16 10:12:12 2022 +0200 PHOENIX-6771 Allow only "squash and merge" from GitHub UI --- .asf.yaml | 34 ++ 1 file changed, 34 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..84aef84 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,34 @@ +# 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. + +# This file controls the integration of the Phoenix Thirdpary repo with ASF +# infrastructure. Refer to +# https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features +# for details. Be careful when changing the contents of this file since it +# may affect many developers of the project and make sure to discuss the +# changes with dev@ before committing. + +notifications: + commits: commits@phoenix.apache.org + issues: iss...@phoenix.apache.org + pullrequests: iss...@phoenix.apache.org + jira_options: link label comment + +github: + enabled_merge_buttons: +squash: true +merge: false +rebase: false
[phoenix-omid] branch master updated (fcaa4724 -> f6676c46)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git from fcaa4724 Merge pull request #113 from apurtell/OMID-228 add f6676c46 OMID-229 Allow only "squash and merge" from GitHub UI No new revisions were added by this update. Summary of changes: RELEASENOTES.md => .asf.yaml | 36 +++- 1 file changed, 19 insertions(+), 17 deletions(-) copy RELEASENOTES.md => .asf.yaml (52%)
[phoenix-connectors] branch master updated: PHOENIX-6771 Allow only "squash and merge" from GitHub UI
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git The following commit(s) were added to refs/heads/master by this push: new f792d33 PHOENIX-6771 Allow only "squash and merge" from GitHub UI f792d33 is described below commit f792d33bd5dc47a8795565cdf35c2529444a84b1 Author: Istvan Toth AuthorDate: Tue Aug 16 09:10:03 2022 +0200 PHOENIX-6771 Allow only "squash and merge" from GitHub UI --- .asf.yaml | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index eeed404..26eaad3 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file controls the integration of the Phoenix Connectors subproject +# This file controls the integration of the Phoenix Connectors repo # with ASF infrastructure. Refer to # https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features # for details. Be careful when changing the contents of this file since it @@ -22,7 +22,13 @@ # changes with dev@ before committing. notifications: -commits: commits@phoenix.apache.org -issues: iss...@phoenix.apache.org -pullrequests: iss...@phoenix.apache.org -jira_options: link label comment + commits: commits@phoenix.apache.org + issues: iss...@phoenix.apache.org + pullrequests: iss...@phoenix.apache.org + jira_options: link label comment + +github: + enabled_merge_buttons: +squash: true +merge: false +rebase: false
[phoenix-connectors] branch master updated: PHOENIX-6772 org.apache.phoenix.spark.DataSourceApiIT.DataSourceApiIT is missing ASF header
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git The following commit(s) were added to refs/heads/master by this push: new c461308 PHOENIX-6772 org.apache.phoenix.spark.DataSourceApiIT.DataSourceApiIT is missing ASF header c461308 is described below commit c461308e53e1295d95d2b5e070bdf96208b25005 Author: Istvan Toth AuthorDate: Tue Aug 16 11:33:11 2022 +0200 PHOENIX-6772 org.apache.phoenix.spark.DataSourceApiIT.DataSourceApiIT is missing ASF header --- .../java/org/apache/phoenix/spark/DataSourceApiIT.java | 18 +- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java b/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java index bbf05e1..dbcf45f 100644 --- a/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java +++ b/phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java @@ -1,6 +1,22 @@ +/* + * 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.spark; -import org.apache.phoenix.end2end.BaseQueryIT; import org.apache.phoenix.end2end.ParallelStatsDisabledIT; import org.apache.spark.SparkConf; import org.apache.spark.api.java.JavaSparkContext;
[phoenix-omid] branch master updated (ba43c8e1 -> e0b1eceb)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git from ba43c8e1 OMID-222 Remove HBase1 support and update HBase 2 version to 2.4 add e0b1eceb OMID-224 Switch default logging backend to log4j2 No new revisions were added by this update. Summary of changes: benchmarks/bin/benchmarks.sh | 2 +- benchmarks/conf/log4j.xml | 28 benchmarks/conf/log4j2.properties | 31 benchmarks/pom.xml | 35 + common/pom.xml | 25 +++ examples/maven/assembly/assembly.xml | 4 +- examples/pom.xml | 26 ++- examples/run.sh| 8 +-- examples/src/main/resources/log4j.properties | 10 --- examples/src/main/resources/log4j2.properties | 31 hbase-client/pom.xml | 34 ++--- hbase-client/src/test/resources/log4j.properties | 54 -- .../src/test/resources/log4j2-test.properties | 31 hbase-commit-table/pom.xml | 36 -- hbase-coprocessor/pom.xml | 33 + hbase-coprocessor/src/test/resources/log4j.xml | 68 -- .../src/test/resources/log4j2-test.properties | 31 hbase-tools/pom.xml| 24 +++ metrics/pom.xml| 8 --- pom.xml| 83 +++--- statemachine/pom.xml | 26 +++ timestamp-storage/pom.xml | 25 +++ .../src/test/resources/log4j.properties| 58 --- .../src/test/resources/log4j2-test.properties | 31 transaction-client/pom.xml | 23 ++ tso-server/conf/log4j.properties | 55 -- tso-server/conf/log4j.xml | 47 tso-server/conf/log4j2.properties | 67 + tso-server/maven/assembly/bin.xml | 1 + tso-server/pom.xml | 27 +-- tso-server/src/test/resources/log4j.properties | 59 --- .../src/test/resources/log4j2-test.properties | 31 32 files changed, 628 insertions(+), 424 deletions(-) delete mode 100644 benchmarks/conf/log4j.xml create mode 100644 benchmarks/conf/log4j2.properties delete mode 100644 examples/src/main/resources/log4j.properties create mode 100644 examples/src/main/resources/log4j2.properties delete mode 100644 hbase-client/src/test/resources/log4j.properties create mode 100644 hbase-client/src/test/resources/log4j2-test.properties delete mode 100755 hbase-coprocessor/src/test/resources/log4j.xml create mode 100644 hbase-coprocessor/src/test/resources/log4j2-test.properties delete mode 100644 timestamp-storage/src/test/resources/log4j.properties create mode 100644 timestamp-storage/src/test/resources/log4j2-test.properties delete mode 100644 tso-server/conf/log4j.properties delete mode 100755 tso-server/conf/log4j.xml create mode 100644 tso-server/conf/log4j2.properties delete mode 100644 tso-server/src/test/resources/log4j.properties create mode 100644 tso-server/src/test/resources/log4j2-test.properties
[phoenix] branch 5.1 updated: PHOENIX-6766 Fix failure of sqlline due to conflicting jline dependency pulled from Hadoop 3.3.
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new b12f1f2bbc PHOENIX-6766 Fix failure of sqlline due to conflicting
jline dependency pulled from Hadoop 3.3.
b12f1f2bbc is described below
commit b12f1f2bbc57a5a488eb754697459ff8b486f43a
Author: Masatake Iwasaki
AuthorDate: Tue Aug 9 12:40:08 2022 +
PHOENIX-6766 Fix failure of sqlline due to conflicting jline dependency
pulled from Hadoop 3.3.
---
pom.xml | 12
1 file changed, 12 insertions(+)
diff --git a/pom.xml b/pom.xml
index cbd8b2f240..74fab1b26f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -811,6 +811,18 @@
${hadoop.version}
+
+org.apache.hadoop
+hadoop-yarn-client
+${hadoop.version}
+
+
+org.jline
+jline
+
+
+
+
org.apache.hadoop
[phoenix] branch master updated: PHOENIX-6766 Fix failure of sqlline due to conflicting jline dependency pulled from Hadoop 3.3.
This is an automated email from the ASF dual-hosted git repository.
stoty 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 394f47222b PHOENIX-6766 Fix failure of sqlline due to conflicting
jline dependency pulled from Hadoop 3.3.
394f47222b is described below
commit 394f47222b225912c3b7b12d5f1b54590ac3744b
Author: Masatake Iwasaki
AuthorDate: Tue Aug 9 12:40:08 2022 +
PHOENIX-6766 Fix failure of sqlline due to conflicting jline dependency
pulled from Hadoop 3.3.
---
pom.xml | 12
1 file changed, 12 insertions(+)
diff --git a/pom.xml b/pom.xml
index f4727c1ba8..1a6d60078a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -845,6 +845,18 @@
${hadoop.version}
+
+org.apache.hadoop
+hadoop-yarn-client
+${hadoop.version}
+
+
+org.jline
+jline
+
+
+
+
org.apache.hadoop
[phoenix-queryserver] branch master updated: PHOENIX-6762 Phoenix QueryServer cannot run correctly with python 3.8+
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new f7fd09d PHOENIX-6762 Phoenix QueryServer cannot run correctly with python 3.8+ f7fd09d is described below commit f7fd09d1b303d83f463a902ad7b0006c2d21bf85 Author: Istvan Toth AuthorDate: Mon Aug 8 07:31:43 2022 +0200 PHOENIX-6762 Phoenix QueryServer cannot run correctly with python 3.8+ backport https://pagure.io/python-daemon/c/b708912 --- bin/daemon.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/daemon.py b/bin/daemon.py index a548ec6..4cbb22f 100644 --- a/bin/daemon.py +++ b/bin/daemon.py @@ -38,6 +38,7 @@ # # Apache Phoenix note: this file is `daemon.py` from the package # `python-daemon 2.0.5`, https://pypi.python.org/pypi/python-daemon/ +# Backported Python 3.8 fix in PHOENIX-6762 # # The class `PidFile` was added for adapting the `lockfile` package's interface # without depending on yet another 3rd party package. Based on example from @@ -727,9 +728,8 @@ def is_socket(fd): """ result = False -file_socket = socket.fromfd(fd, socket.AF_INET, socket.SOCK_RAW) - try: +file_socket = socket.fromfd(fd, socket.AF_INET, socket.SOCK_RAW) socket_type = file_socket.getsockopt( socket.SOL_SOCKET, socket.SO_TYPE) except socket.error as exc:
[phoenix-connectors] branch master updated: PHOENIX-6760 update log4j2 to 2.18.0
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new 996fec8 PHOENIX-6760 update log4j2 to 2.18.0
996fec8 is described below
commit 996fec8c6befe103ef9328533c4eed56c8d73933
Author: Istvan Toth
AuthorDate: Tue Aug 2 19:21:56 2022 +0200
PHOENIX-6760 update log4j2 to 2.18.0
---
phoenix-hive-base/phoenix4-hive-shaded/pom.xml | 1 -
phoenix-hive-base/phoenix4-hive/pom.xml| 1 -
phoenix-hive-base/phoenix5-hive-shaded/pom.xml | 6 --
phoenix-hive-base/phoenix5-hive/pom.xml| 6 --
phoenix-hive-base/pom.xml | 13 +
pom.xml| 2 +-
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/phoenix-hive-base/phoenix4-hive-shaded/pom.xml
b/phoenix-hive-base/phoenix4-hive-shaded/pom.xml
index 08e95f7..b477449 100644
--- a/phoenix-hive-base/phoenix4-hive-shaded/pom.xml
+++ b/phoenix-hive-base/phoenix4-hive-shaded/pom.xml
@@ -35,7 +35,6 @@
${hive2.version}
${hive2-storage.version}
-2.6.2
diff --git a/phoenix-hive-base/phoenix4-hive/pom.xml
b/phoenix-hive-base/phoenix4-hive/pom.xml
index d08cf42..d2fd374 100644
--- a/phoenix-hive-base/phoenix4-hive/pom.xml
+++ b/phoenix-hive-base/phoenix4-hive/pom.xml
@@ -35,7 +35,6 @@
${hive2.version}
${hive2-storage.version}
-2.6.2
diff --git a/phoenix-hive-base/phoenix5-hive-shaded/pom.xml
b/phoenix-hive-base/phoenix5-hive-shaded/pom.xml
index 3f995b5..25996f7 100644
--- a/phoenix-hive-base/phoenix5-hive-shaded/pom.xml
+++ b/phoenix-hive-base/phoenix5-hive-shaded/pom.xml
@@ -161,12 +161,6 @@
hadoop-hdfs-client
provided
-
- org.apache.logging.log4j
- log4j-core
- ${log4j2.version}
- test
-
org.apache.hadoop
hadoop-minicluster
diff --git a/phoenix-hive-base/phoenix5-hive/pom.xml
b/phoenix-hive-base/phoenix5-hive/pom.xml
index d8f7809..7e91939 100644
--- a/phoenix-hive-base/phoenix5-hive/pom.xml
+++ b/phoenix-hive-base/phoenix5-hive/pom.xml
@@ -139,12 +139,6 @@
hadoop-hdfs-client
provided
-
- org.apache.logging.log4j
- log4j-core
- ${log4j2.version}
- test
-
org.apache.hadoop
hadoop-minicluster
diff --git a/phoenix-hive-base/pom.xml b/phoenix-hive-base/pom.xml
index 2f627cb..5521583 100644
--- a/phoenix-hive-base/pom.xml
+++ b/phoenix-hive-base/pom.xml
@@ -18,6 +18,7 @@
specific language governing permissions and limitations
under the License.
+
-->
http://maven.apache.org/POM/4.0.0;
@@ -193,6 +194,18 @@
provided
${log4j2.version}
+
+ org.apache.logging.log4j
+ log4j-core
+ provided
+ ${log4j2.version}
+
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+ provided
+ ${log4j2.version}
+
diff --git a/pom.xml b/pom.xml
index 2d1e693..ab4e005 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
2.11
1.2.17
-2.17.2
+2.18.0
3.3.6
1.7.30
3.2.2
[phoenix] branch master updated: PHOENIX-6756 switch to using log4j2.properties instead of xml
This is an automated email from the ASF dual-hosted git repository.
stoty 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 6952c6c81d PHOENIX-6756 switch to using log4j2.properties instead of
xml
6952c6c81d is described below
commit 6952c6c81d2abd0201b140bbce2f31b4efe604ca
Author: Istvan Toth
AuthorDate: Fri Jul 29 09:24:42 2022 +0200
PHOENIX-6756 switch to using log4j2.properties instead of xml
also fix serveral problems introduced in the original log4j2 patch
change log format to match HBase both for tests and utilities
---
bin/log4j2.properties | 67 ++
bin/log4j2.xml | 61
bin/performance.py | 4 +-
bin/pherf-standalone.py| 4 +-
bin/phoenix_sandbox.py | 4 +-
bin/psql.py| 4 +-
bin/sandbox-log4j.properties | 45 ---
bin/sandbox-log4j2.properties | 65 +
bin/sqlline.py | 2 +-
bin/traceserver.py | 4 +-
phoenix-core/src/it/resources/log4j.properties | 63
.../src/it/resources/log4j2-test.properties| 45 +++
phoenix-core/src/it/resources/log4j2-test.xml | 49
phoenix-core/src/test/resources/log4j.properties | 65 -
.../src/test/resources/log4j2-test.properties | 50
phoenix-core/src/test/resources/log4j2-test.xml| 51
phoenix-pherf/config/log4j2.properties | 67 ++
phoenix-pherf/config/log4j2.xml| 51
18 files changed, 306 insertions(+), 395 deletions(-)
diff --git a/bin/log4j2.properties b/bin/log4j2.properties
new file mode 100644
index 00..5e1875a2d1
--- /dev/null
+++ b/bin/log4j2.properties
@@ -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.
+# */
+
+# This config is used by sqlline, pherf and psql
+
+status = warn
+dest = err
+name = PropertiesConfig
+
+# Console appender
+appender.console.type = Console
+appender.console.target = SYSTEM_ERR
+appender.console.name = console
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{ISO8601} %-5p [%t] %c{2}: %.1000m%n
+
+# Not used by default
+# Daily Rolling File Appender
+appender.DRFA.type = RollingFile
+appender.DRFA.name = DRFA
+appender.DRFA.fileName = ${sys:psql.log.dir:-.}/${sys:psql.log.file:-psql.log}
+appender.DRFA.filePattern =
${sys:psql.log.dir:-.}/${sys:psql.log.file:-psql.log}.%d{-MM-dd}
+appender.DRFA.createOnDemand = true
+appender.DRFA.layout.type = PatternLayout
+appender.DRFA.layout.pattern = %d{ISO8601} %-5p [%t] %c{2}: %.1000m%n
+appender.DRFA.policies.type = Policies
+appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy
+appender.DRFA.policies.time.interval = 1
+appender.DRFA.policies.time.modulate = true
+appender.DRFA.policies.size.type = SizeBasedTriggeringPolicy
+appender.DRFA.policies.size.size = ${sys:psql.log.maxfilesize:-256MB}
+appender.DRFA.strategy.type = DefaultRolloverStrategy
+appender.DRFA.strategy.max = ${sys:psql.log.maxbackupindex:-20}
+
+# Null Appender
+appender.NullAppender.type = Null
+appender.NullAppender.name = NullAppender
+
+rootLogger = ${sys:psql.root.logger:-WARN,console}
+
+# Custom Logging levels
+logger.zookeeper.name = org.apache.zookeeper
+logger.zookeeper.level = ERROR
+
+logger.hbase_zk_rzk.name =
org.apache.hadoop.hbase.zookeeper.RecoverableZooKeeper
+logger.hbase_zk_rzk.level = ERROR
+
+logger.hbase_zk_zku.name = org.apache.hadoop.hbase.zookeeper.ZKUtil
+logger.hbase_zk_zku.level = ERROR
+
+logger.hbase_conf.name = org.apache.hadoop.hbase.HBaseConfiguration
+logger.hbase_conf.level = ERROR
diff --git a/bin/log4j2.xml b/bin/log4j2.xml
deleted file mode 100644
index 1d93814838..00
--- a/bin/log4j2.xml
+++ /de
[phoenix] branch master updated: PHOENIX-6760 update log4j2 to 2.18.0
This is an automated email from the ASF dual-hosted git repository. stoty 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 5b22c37602 PHOENIX-6760 update log4j2 to 2.18.0 5b22c37602 is described below commit 5b22c37602f13fe2683cccd8d11ef14c7d99f972 Author: Istvan Toth AuthorDate: Tue Aug 2 13:04:23 2022 +0200 PHOENIX-6760 update log4j2 to 2.18.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac0dbf236c..f4727c1ba8 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ 3.5.2 1.2.19 -2.17.2 +2.18.0 3.3.6 1.7.36
[phoenix] branch master updated: PHOENIX-6707. Replace getLong() with getLongBytes() for appropriate config items
This is an automated email from the ASF dual-hosted git repository.
stoty 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 51c8b023d9 PHOENIX-6707. Replace getLong() with getLongBytes() for
appropriate config items
51c8b023d9 is described below
commit 51c8b023d9054476126dff5ac485acf7a365a173
Author: Andor Molnar
AuthorDate: Mon May 16 14:01:30 2022 +0200
PHOENIX-6707. Replace getLong() with getLongBytes() for appropriate config
items
---
.../DataTableLocalIndexRegionScanner.java | 2 +-
.../java/org/apache/phoenix/cache/GlobalCache.java | 5 ++-
.../cache/aggcache/SpillableGroupByCache.java | 3 +-
.../org/apache/phoenix/compile/DeleteCompiler.java | 8 +++-
.../org/apache/phoenix/compile/UpsertCompiler.java | 6 ++-
.../coprocessor/GlobalIndexRegionScanner.java | 2 +-
.../UngroupedAggregateRegionObserver.java | 2 +-
.../UngroupedAggregateRegionScanner.java | 2 +-
.../org/apache/phoenix/execute/AggregatePlan.java | 5 ++-
.../phoenix/execute/ClientAggregatePlan.java | 4 +-
.../org/apache/phoenix/execute/ClientScanPlan.java | 2 +-
.../org/apache/phoenix/execute/HashJoinPlan.java | 2 +-
.../apache/phoenix/execute/SortMergeJoinPlan.java | 2 +-
.../iterate/NonAggregateRegionScannerFactory.java | 3 +-
.../phoenix/iterate/SpoolingResultIterator.java| 6 ++-
.../org/apache/phoenix/jdbc/PhoenixConnection.java | 2 +-
.../org/apache/phoenix/join/HashCacheClient.java | 4 +-
.../phoenix/mapreduce/MultiHfileOutputFormat.java | 2 +-
.../apache/phoenix/query/GuidePostsCacheImpl.java | 2 +-
.../apache/phoenix/query/QueryServicesOptions.java | 2 +-
.../schema/stats/DefaultStatisticsCollector.java | 2 +-
.../java/org/apache/phoenix/util/JDBCUtil.java | 5 ++-
.../org/apache/phoenix/util/ReadOnlyProps.java | 22 +
.../org/apache/phoenix/util/ReadOnlyPropsTest.java | 52 ++
24 files changed, 119 insertions(+), 28 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/DataTableLocalIndexRegionScanner.java
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/DataTableLocalIndexRegionScanner.java
index ec84cbcc30..5065d7cff4 100644
---
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/DataTableLocalIndexRegionScanner.java
+++
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/DataTableLocalIndexRegionScanner.java
@@ -77,7 +77,7 @@ public class DataTableLocalIndexRegionScanner extends
DelegateRegionScanner {
this.localIndexFamily = localIndexFamily;
this.region=region;
maxBatchSize = conf.getInt(MUTATE_BATCH_SIZE_ATTRIB,
QueryServicesOptions.DEFAULT_MUTATE_BATCH_SIZE);
-maxBatchSizeBytes = conf.getLong(MUTATE_BATCH_SIZE_BYTES_ATTRIB,
+maxBatchSizeBytes = conf.getLongBytes(MUTATE_BATCH_SIZE_BYTES_ATTRIB,
QueryServicesOptions.DEFAULT_MUTATE_BATCH_SIZE_BYTES);
mutationList=new
UngroupedAggregateRegionObserver.MutationList(maxBatchSize);
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/GlobalCache.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/GlobalCache.java
index 3b3116b531..ba5bb4b1fd 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/cache/GlobalCache.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/GlobalCache.java
@@ -99,7 +99,8 @@ public class GlobalCache extends TenantCacheImpl {
long maxTTL = config.getLong(
QueryServices.MAX_SERVER_METADATA_CACHE_TIME_TO_LIVE_MS_ATTRIB,
QueryServicesOptions.DEFAULT_MAX_SERVER_METADATA_CACHE_TIME_TO_LIVE_MS);
-long maxSize =
config.getLong(QueryServices.MAX_SERVER_METADATA_CACHE_SIZE_ATTRIB,
+long maxSize = config.getLongBytes(
+
QueryServices.MAX_SERVER_METADATA_CACHE_SIZE_ATTRIB,
QueryServicesOptions.DEFAULT_MAX_SERVER_METADATA_CACHE_SIZE);
metaDataCache = result = CacheBuilder.newBuilder()
.maximumWeight(maxSize)
@@ -146,7 +147,7 @@ public class GlobalCache extends TenantCacheImpl {
private static long getMaxMemorySize(Configuration config) {
long maxSize = Runtime.getRuntime().maxMemory() *
config.getInt(MAX_MEMORY_PERC_ATTRIB,
QueryServicesOptions.DEFAULT_MAX_MEMORY_PERC) / 100;
-maxSize = Math.min(maxSize, config.getLong(MAX_MEMORY_SIZE_ATTRIB,
Long.MAX_VALUE));
+maxSize = Math.min(maxSize,
config.getLongBytes(MAX_MEMORY_SIZE_ATTRIB, Long.MAX_VALUE));
return maxSize;
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillableGroupByCache.java
b/phoenix-core/src/main/java/org/apache
[phoenix] branch master updated: PHOENIX-6746 Test suite executions do not provide usable logs
This is an automated email from the ASF dual-hosted git repository.
stoty 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 b95df40fc5 PHOENIX-6746 Test suite executions do not provide usable
logs
b95df40fc5 is described below
commit b95df40fc5f13359bddd5dc6f857ecdd04b0dcf1
Author: Istvan Toth
AuthorDate: Tue Jul 19 08:36:29 2022 +0200
PHOENIX-6746 Test suite executions do not provide usable logs
rename log4j2 config files to the correct names
use log4j2 for tests for every HBase profile
---
bin/{log4j.xml => log4j2.xml} | 0
phoenix-assembly/pom.xml | 9 --
phoenix-core/pom.xml | 121 -
.../it/resources/{log4j.xml => log4j2-test.xml}| 0
.../test/resources/{log4j.xml => log4j2-test.xml} | 0
phoenix-pherf/config/{log4j.xml => log4j2.xml} | 0
phoenix-pherf/pom.xml | 31 ++
pom.xml| 12 +-
8 files changed, 60 insertions(+), 113 deletions(-)
diff --git a/bin/log4j.xml b/bin/log4j2.xml
similarity index 100%
rename from bin/log4j.xml
rename to bin/log4j2.xml
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 8c69d861fd..53c0f86002 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -159,15 +159,6 @@
org.apache.phoenix
phoenix-tracing-webapp
-
-
- org.slf4j
- slf4j-reload4j
-
-
- ch.qos.reload4j
- reload4j
-
sqlline
sqlline
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index ffb3477a23..5f3108660d 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -568,6 +568,26 @@
+
+org.apache.logging.log4j
+log4j-api
+test
+
+
+org.apache.logging.log4j
+log4j-core
+test
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+test
+
+
+org.apache.logging.log4j
+log4j-1.2-api
+test
+
junit
junit
@@ -584,105 +604,4 @@
test
-
-
-phoenix-hbase-compat-2.3.0
-
-
-
-hbase.profile
-2.3
-
-
-
- 2.3
-
-
-
-ch.qos.reload4j
-reload4j
-test
-
-
-org.slf4j
-slf4j-reload4j
-test
-
-
-
-
-phoenix-hbase-compat-2.4.0
-
-
-
-hbase.profile
-2.4.0
-
-
-
- 2.4.0
-
-
-
-ch.qos.reload4j
-reload4j
-test
-
-
-org.slf4j
-slf4j-reload4j
-test
-
-
-
-
-phoenix-hbase-compat-2.4.1
-
-
-
-hbase.profile
-2.4
-
-
-
- 2.4
-
-
-
-ch.qos.reload4j
-reload4j
-test
-
-
-org.slf4j
-slf4j-reload4j
-test
-
-
-
-
-phoenix-hbase-compat-2.4.1-default
-
-
-
-!hbase.profile
-
-
-
- 2.4
-
-
-
-ch.qos.reload4j
-reload4j
-test
-
-
-org.slf4j
-slf4j-reload4j
-test
-
-
-
-
diff --git a/phoenix-core/src/it/resources/log4j.xml
b/phoenix-core/src/it/resources/log4j2-test.xml
similarity index 100%
rename from phoenix-core/src/it/resources/log4j.xml
rename to phoenix-core/src/it/resources/log4j2-test.xml
diff --git a/phoenix-core/src/test/resources/log4j.xml
b/phoenix-core/src/test/resources/log4j2-test.xml
similarity index 100%
rename from phoenix-core/src/test/resources/log4j.xml
rename to phoenix-core/src/test/resources/log4j2-test.xml
diff --git a/phoenix-pherf/config/log4j.xml b/phoenix-pherf/config/log4j2.xml
similarity index 100%
rename from phoenix-pherf/config/log4j.xml
rename to phoenix-pherf/config/log4j2.xml
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 4ba9260ff8..a7cb5c5c27 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -168,6 +168,25 @@
+org.apache.logging.log4j
+log4j-api
+test
+
+
+org.apache.logging.log4j
+log4j-core
+test
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+test
+
+
+org.apache.logging.log4j
+log4j-1.2-api
+test
+
org.apache.phoenix
phoenix-core
test-jar
@@ -290,6 +309,18 @@
org.apache.hbase:hbase-testing-util
+
+ org.apache.logging.log4j:log4j-api
+
+
+ org.apache.logging.log4
svn commit: r1902737 - in /phoenix/site: publish/download.html publish/language/datatypes.html publish/language/functions.html publish/language/index.html source/src/site/markdown/download.md
Author: stoty Date: Fri Jul 15 15:14:15 2022 New Revision: 1902737 URL: http://svn.apache.org/viewvc?rev=1902737=rev Log: Update Phoenixdb on downloads page to 1.2 Modified: phoenix/site/publish/download.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/download.md Modified: phoenix/site/publish/download.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/download.html?rev=1902737=1902736=1902737=diff == --- phoenix/site/publish/download.html (original) +++ phoenix/site/publish/download.html Fri Jul 15 15:14:15 2022 @@ -1,7 +1,7 @@ @@ -254,7 +254,7 @@ //
[phoenix-queryserver] branch master updated: Bump phoenixdb version to 1.2.1.dev0 after release
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git The following commit(s) were added to refs/heads/master by this push: new 53509a6 Bump phoenixdb version to 1.2.1.dev0 after release 53509a6 is described below commit 53509a6e61f4c89b724038fd7ee62f75631a1c4e Author: Istvan Toth AuthorDate: Fri Jul 15 17:01:26 2022 +0200 Bump phoenixdb version to 1.2.1.dev0 after release --- python-phoenixdb/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-phoenixdb/setup.py b/python-phoenixdb/setup.py index 0e60553..9bd59f5 100644 --- a/python-phoenixdb/setup.py +++ b/python-phoenixdb/setup.py @@ -59,7 +59,7 @@ else: 'Sphinx;python_version>="3.6"', ], -version = "1.2.0" +version = "1.2.1.dev0" setup( name="phoenixdb",
[phoenix-queryserver] annotated tag python-phoenixdb-1.2.0 updated (c1bfbdf -> be1af5e)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to annotated tag python-phoenixdb-1.2.0 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git *** WARNING: tag python-phoenixdb-1.2.0 was modified! *** from c1bfbdf (commit) to be1af5e (tag) tagging c1bfbdf1299a28ab6d2e25d892577aa4097db9a0 (commit) replaces python-phoenixdb-1.2.0.rc0 by Istvan Toth on Fri Jul 15 16:58:47 2022 +0200 - Log - python-phoenixdb 1.2.0 release --- No new revisions were added by this update. Summary of changes:
svn commit: r55767 - /dev/phoenix/python-phoenixdb-1.2.0.rc1/ /release/phoenix/python-phoenixdb-1.2.0/
Author: stoty Date: Fri Jul 15 14:57:34 2022 New Revision: 55767 Log: release python-phoenixdb-1.2.0rc1 as python-phoenixdb-1.2.0 Added: release/phoenix/python-phoenixdb-1.2.0/ - copied from r55766, dev/phoenix/python-phoenixdb-1.2.0.rc1/ Removed: dev/phoenix/python-phoenixdb-1.2.0.rc1/
svn commit: r55705 - in /dev/phoenix/python-phoenixdb-1.2.0.rc1: ./ src/ src/python-phoenixdb-1.2.0-src.tar.gz src/python-phoenixdb-1.2.0-src.tar.gz.asc src/python-phoenixdb-1.2.0-src.tar.gz.sha512
Author: stoty Date: Tue Jul 12 13:46:27 2022 New Revision: 55705 Log: phoenixDB 1.2.0.rc1 Added: dev/phoenix/python-phoenixdb-1.2.0.rc1/ dev/phoenix/python-phoenixdb-1.2.0.rc1/src/ dev/phoenix/python-phoenixdb-1.2.0.rc1/src/python-phoenixdb-1.2.0-src.tar.gz (with props) dev/phoenix/python-phoenixdb-1.2.0.rc1/src/python-phoenixdb-1.2.0-src.tar.gz.asc dev/phoenix/python-phoenixdb-1.2.0.rc1/src/python-phoenixdb-1.2.0-src.tar.gz.sha512 Added: dev/phoenix/python-phoenixdb-1.2.0.rc1/src/python-phoenixdb-1.2.0-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/python-phoenixdb-1.2.0.rc1/src/python-phoenixdb-1.2.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/python-phoenixdb-1.2.0.rc1/src/python-phoenixdb-1.2.0-src.tar.gz.asc == --- dev/phoenix/python-phoenixdb-1.2.0.rc1/src/python-phoenixdb-1.2.0-src.tar.gz.asc (added) +++ dev/phoenix/python-phoenixdb-1.2.0.rc1/src/python-phoenixdb-1.2.0-src.tar.gz.asc Tue Jul 12 13:46:27 2022 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEglIDpwQFvIOuz199lzUcG3lEM8cFAmLNeBIACgkQlzUcG3lE +M8dwSgf/b1aLFxHpEdGjfW9PJLFOM3c3Z8uAgKFbWp1uljk5EqidRJRlOeg4HvaA +kHGRvB+PSwWZqDmwJvs3JK05Wp8A5hzwqWhXp6baHPigU+qYBNiW1eJr71TKpB/6 +7GPbaYZrrO/AX+8AIrRquCz/eMwqCajoYCvA5joLjzBLTHjlMcnnDpBUrAeR1i8j +OOskbaolyhBp6IQVcSGtFrypOt6SBtZB6GOxSiqgPrjSPLm02+B4iYfdx8tFKHfL +TCb27DQnS9fpHkzuI8tFT89z+caKSEcZKitQTt/hI1A+2LOjXxdvSlL2jPizvty5 +mg9FIVtJkl5Y3LPsyxfzaI4SnkDf6g== +=biwf +-END PGP SIGNATURE- Added: dev/phoenix/python-phoenixdb-1.2.0.rc1/src/python-phoenixdb-1.2.0-src.tar.gz.sha512 == --- dev/phoenix/python-phoenixdb-1.2.0.rc1/src/python-phoenixdb-1.2.0-src.tar.gz.sha512 (added) +++ dev/phoenix/python-phoenixdb-1.2.0.rc1/src/python-phoenixdb-1.2.0-src.tar.gz.sha512 Tue Jul 12 13:46:27 2022 @@ -0,0 +1 @@ +8075b16279424036e74b4ceb3e9f5c47a6c62105c221a6b970e212bf8d04d81983354a2cf1f7f016fb17b574b4e10498ca9ff0e71a6f05e58c9f18815ea058ba *python-phoenixdb-1.2.0-src.tar.gz
[phoenix-queryserver] annotated tag python-phoenixdb-1.2.0.rc1 updated (c1bfbdf -> c58fc36)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to annotated tag python-phoenixdb-1.2.0.rc1 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git *** WARNING: tag python-phoenixdb-1.2.0.rc1 was modified! *** from c1bfbdf (commit) to c58fc36 (tag) tagging c1bfbdf1299a28ab6d2e25d892577aa4097db9a0 (commit) replaces python-phoenixdb-1.2.0.rc0 by Istvan Toth on Tue Jul 12 15:33:34 2022 +0200 - Log - python-phoenixdb-1.2.0.rc1 --- No new revisions were added by this update. Summary of changes:
[phoenix-queryserver] branch master updated: PHOENIX-6737 PhoenixDB test environment update (addendum: add license header to docker-entrypoint.sh)
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git
The following commit(s) were added to refs/heads/master by this push:
new c1bfbdf PHOENIX-6737 PhoenixDB test environment update (addendum: add
license header to docker-entrypoint.sh)
c1bfbdf is described below
commit c1bfbdf1299a28ab6d2e25d892577aa4097db9a0
Author: Istvan Toth
AuthorDate: Tue Jul 12 15:14:43 2022 +0200
PHOENIX-6737 PhoenixDB test environment update (addendum: add license
header to docker-entrypoint.sh)
---
python-phoenixdb/docker-entrypoint.sh | 15 +++
1 file changed, 15 insertions(+)
diff --git a/python-phoenixdb/docker-entrypoint.sh
b/python-phoenixdb/docker-entrypoint.sh
index ee24d88..db74b54 100755
--- a/python-phoenixdb/docker-entrypoint.sh
+++ b/python-phoenixdb/docker-entrypoint.sh
@@ -1,5 +1,20 @@
#!/bin/bash -l
+# 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.
+
set -e
if [ "$#" -eq 0 ]; then
find /src -mindepth 1 -maxdepth 1 \( -type d -name ".*" -prune \) -o -exec
cp -r --target-directory=/app -- {} +
[phoenix] branch master updated: PHOENIX-6695 Switch default logging backed to log4j2
This is an automated email from the ASF dual-hosted git repository.
stoty 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 c4dba44098 PHOENIX-6695 Switch default logging backed to log4j2
c4dba44098 is described below
commit c4dba440985e238f06c74ef3b1721d001358c182
Author: Istvan Toth
AuthorDate: Tue Apr 26 14:45:38 2022 +0200
PHOENIX-6695 Switch default logging backed to log4j2
---
bin/log4j.properties | 76 -
bin/log4j.xml | 61 +++
bin/phoenix_utils.py | 8 +-
.../build/components/all-common-dependencies.xml | 6 +-
phoenix-client-parent/pom.xml | 1 +
phoenix-core/pom.xml | 118 -
phoenix-core/src/it/resources/log4j.xml| 49 ++
phoenix-core/src/test/resources/log4j.xml | 51 ++
phoenix-pherf/config/log4j.properties | 58 ---
phoenix-pherf/config/log4j.xml | 51 ++
phoenix-server/pom.xml | 9 +-
phoenix-tracing-webapp/pom.xml | 17 +-
pom.xml| 183 -
13 files changed, 535 insertions(+), 153 deletions(-)
diff --git a/bin/log4j.properties b/bin/log4j.properties
deleted file mode 100644
index 2d007e1f3d..00
--- a/bin/log4j.properties
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-
-# Define some default values that can be overridden by system properties
-psql.root.logger=WARN,console
-psql.log.dir=.
-psql.log.file=psql.log
-hadoop.log.dir=.
-
-# Define the root logger to the system property "plsql.root.logger".
-log4j.rootLogger=${psql.root.logger}
-
-# Logging Threshold to INFO for queryserver. root logger still at WARN for
sqlline clients.
-log4j.threshold=INFO
-
-#
-# Daily Rolling File Appender
-#
-log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DRFA.File=${psql.log.dir}/${psql.log.file}
-
-# Rollver at midnight
-log4j.appender.DRFA.DatePattern=.-MM-dd
-
-# 30-day backup
-#log4j.appender.DRFA.MaxBackupIndex=30
-log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
-
-# Pattern format: Date LogLevel LoggerName LogMessage
-log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
-
-# Debugging Pattern format
-#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2}
(%F:%M(%L)) - %m%n
-
-#
-# Null Appender
-#
-log4j.appender.NullAppender=org.apache.log4j.varia.NullAppender
-
-#
-# console
-# Add "console" to rootlogger above if you want to use this
-#
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p
%c{2}: %m%n
-
-# Custom Logging levels
-log4j.logger.org.apache.zookeeper=ERROR
-log4j.logger.org.apache.hadoop.hbase.zookeeper.RecoverableZooKeeper=ERROR
-log4j.logger.org.apache.hadoop.hbase.zookeeper.ZKUtil=ERROR
-log4j.logger.org.apache.hadoop.hbase.HBaseConfiguration=ERROR
-
-# query server packages
-log4j.logger.org.apache.calcite.avatica=INFO
-log4j.logger.org.apache.phoenix.queryserver.server=INFO
-log4j.logger.org.eclipse.jetty.server=INFO
diff --git a/bin/log4j.xml b/bin/log4j.xml
new file mode 100644
index 00..1d93814838
--- /dev/null
+++ b/bin/log4j.xml
@@ -0,0 +1,61 @@
+
+
+
+
+.
+.
+psql.log
+WARN,console
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py
index 012d09d9f7..de00f4efa9 100755
--- a/bin/phoenix_utils.py
+++ b/bin/phoenix_utils.py
@@ -81,8 +81,10 @@ def setPath():
PHOENIX_TRACESERVER_JAR_PATTERN = "phoenix-tracing-webapp-*-runnable.jar"
PHOE
svn commit: r55255 - in /dev/phoenix/python-phoenixdb-1.2.0.rc0: ./ src/ src/python-phoenixdb-1.2.0-src.tar.gz src/python-phoenixdb-1.2.0-src.tar.gz.asc src/python-phoenixdb-1.2.0-src.tar.gz.sha512
Author: stoty Date: Wed Jun 22 08:46:00 2022 New Revision: 55255 Log: python-phoenixdb 1.2.0RC0 Added: dev/phoenix/python-phoenixdb-1.2.0.rc0/ dev/phoenix/python-phoenixdb-1.2.0.rc0/src/ dev/phoenix/python-phoenixdb-1.2.0.rc0/src/python-phoenixdb-1.2.0-src.tar.gz (with props) dev/phoenix/python-phoenixdb-1.2.0.rc0/src/python-phoenixdb-1.2.0-src.tar.gz.asc dev/phoenix/python-phoenixdb-1.2.0.rc0/src/python-phoenixdb-1.2.0-src.tar.gz.sha512 Added: dev/phoenix/python-phoenixdb-1.2.0.rc0/src/python-phoenixdb-1.2.0-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/python-phoenixdb-1.2.0.rc0/src/python-phoenixdb-1.2.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/python-phoenixdb-1.2.0.rc0/src/python-phoenixdb-1.2.0-src.tar.gz.asc == --- dev/phoenix/python-phoenixdb-1.2.0.rc0/src/python-phoenixdb-1.2.0-src.tar.gz.asc (added) +++ dev/phoenix/python-phoenixdb-1.2.0.rc0/src/python-phoenixdb-1.2.0-src.tar.gz.asc Wed Jun 22 08:46:00 2022 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEglIDpwQFvIOuz199lzUcG3lEM8cFAmKy018ACgkQlzUcG3lE +M8dMnAf+N+YsdyqAJCax+4vVHPiUzmQggDej6UMSbzd256KkWVTMXpEIeF6yzrB5 +SWYzftH6yOL9N0sAQL97EgH6fqWh11NW/7ePQQ5slVg2Lia42Yh4UF46T+h0x5hn +0+MRPqaP9UwmjScYJhyX0bHi/FVBap3DQEgb9h567fEXhtMGQXYMRb/Ez0hQmGwS +4qo7vQDlhojZMj7NlO4EZrbfggIXLUC14a9Xuozu9LAXGP50ULx5TXxAMAXDKe7z +r2xw9Jkp616fAtgK6ktb3XRb7LMpQElyVM/i6s6n2GlA08ZHFTSmDRrDloJoDOfO +hVKF34DLol6Pv+CEIXULxiegAIP/WA== +=qz8N +-END PGP SIGNATURE- Added: dev/phoenix/python-phoenixdb-1.2.0.rc0/src/python-phoenixdb-1.2.0-src.tar.gz.sha512 == --- dev/phoenix/python-phoenixdb-1.2.0.rc0/src/python-phoenixdb-1.2.0-src.tar.gz.sha512 (added) +++ dev/phoenix/python-phoenixdb-1.2.0.rc0/src/python-phoenixdb-1.2.0-src.tar.gz.sha512 Wed Jun 22 08:46:00 2022 @@ -0,0 +1 @@ +0f8266a6eb2863d413b204938635d9136e1778dbdb0ec05e57342b7ac69a08fe255226b43e042d707ff6bc9ef018ff76e285b6f35bfcdea966e0a2fb76bdaf06 *python-phoenixdb-1.2.0-src.tar.gz
[phoenix-queryserver] annotated tag python-phoenixdb-1.2.0.rc0 updated (bd1b369 -> 0be6f91)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to annotated tag python-phoenixdb-1.2.0.rc0 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git *** WARNING: tag python-phoenixdb-1.2.0.rc0 was modified! *** from bd1b369 (commit) to 0be6f91 (tag) tagging bd1b36987912f20f1074e93caf257397111b8e9f (commit) replaces python-phoenixdb-1.1.0 by Istvan Toth on Wed Jun 22 10:32:02 2022 +0200 - Log - python-phoenixdb-1.2.0.rc0 --- No new revisions were added by this update. Summary of changes:
[phoenix-queryserver] branch master updated (33b128c -> bd1b369)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git from 33b128c PHOENIX-6737 PhoenixDB test environment update add bd1b369 PHOENIX-6739 Release python-phoenixdb 1.2.0 No new revisions were added by this update. Summary of changes: python-phoenixdb/NEWS.rst | 5 +++-- python-phoenixdb/setup.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
[phoenix-queryserver] branch master updated (58aabde -> 33b128c)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git from 58aabde PHOENIX-6731 Regenerate the protobuf python classes from the Avatica 1.21 .pb file with protoc 3.19 add 33b128c PHOENIX-6737 PhoenixDB test environment update No new revisions were added by this update. Summary of changes: python-phoenixdb/Dockerfile | 22 -- python-phoenixdb/README.rst | 10 +- python-phoenixdb/docker-entrypoint.sh | 10 ++ python-phoenixdb/requirements.txt | 2 +- python-phoenixdb/setup.cfg| 4 python-phoenixdb/setup.py | 2 +- python-phoenixdb/tox.ini | 10 +++--- 7 files changed, 44 insertions(+), 16 deletions(-) create mode 100755 python-phoenixdb/docker-entrypoint.sh
[phoenix-queryserver] branch master updated (30c523f -> 58aabde)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git from 30c523f PHOENIX-6735 Add supports_statement_cache attribute for SqlAlchemy dialect add 58aabde PHOENIX-6731 Regenerate the protobuf python classes from the Avatica 1.21 .pb file with protoc 3.19 No new revisions were added by this update. Summary of changes: python-phoenixdb/NEWS.rst |4 + python-phoenixdb/gen-protobuf.sh |5 +- .../phoenixdb/avatica/proto/common_pb2.py | 1661 ++-- .../phoenixdb/avatica/proto/requests_pb2.py| 1297 +++ .../phoenixdb/avatica/proto/responses_pb2.py | 983 ++-- python-phoenixdb/requirements.txt |4 +- python-phoenixdb/setup.py |3 +- python-phoenixdb/tox.ini |2 +- 8 files changed, 455 insertions(+), 3504 deletions(-)
[phoenix-queryserver] branch master updated: PHOENIX-6735 Add supports_statement_cache attribute for SqlAlchemy dialect
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git
The following commit(s) were added to refs/heads/master by this push:
new 30c523f PHOENIX-6735 Add supports_statement_cache attribute for
SqlAlchemy dialect
30c523f is described below
commit 30c523f964a11704169d1b579431fb15373e5991
Author: Istvan Toth
AuthorDate: Thu Jun 16 15:37:21 2022 +0200
PHOENIX-6735 Add supports_statement_cache attribute for SqlAlchemy dialect
also fix two pytest deprecation warnings
---
python-phoenixdb/NEWS.rst| 4
python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py | 2 ++
python-phoenixdb/phoenixdb/tests/test_dbapi20.py | 4 ++--
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/python-phoenixdb/NEWS.rst b/python-phoenixdb/NEWS.rst
index 5d9dfc8..26874ad 100644
--- a/python-phoenixdb/NEWS.rst
+++ b/python-phoenixdb/NEWS.rst
@@ -1,6 +1,10 @@
Changelog
=
+Version 1.2.0
+-
+- Added supports_statement_cache attribute for SqlAlchemy dialect to avoid
warnings (PHOENIX-6735)
+
Version 1.1.0
-
diff --git a/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py
b/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py
index 15acdd1..486cd89 100644
--- a/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py
+++ b/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py
@@ -90,6 +90,8 @@ class PhoenixDialect(DefaultDialect):
driver = "phoenixdb"
+supports_statement_cache = False # We only implement textual SQL anyway
+
ddl_compiler = PhoenixDDLCompiler
execution_ctx_cls = PhoenixExecutionContext
diff --git a/python-phoenixdb/phoenixdb/tests/test_dbapi20.py
b/python-phoenixdb/phoenixdb/tests/test_dbapi20.py
index c80ecb4..67a8ec8 100644
--- a/python-phoenixdb/phoenixdb/tests/test_dbapi20.py
+++ b/python-phoenixdb/phoenixdb/tests/test_dbapi20.py
@@ -105,7 +105,7 @@ class PhoenixDatabaseAPI20Test(dbapi20.DatabaseAPI20Test):
# no rows
cur.execute('select name from %sbooze' % self.table_prefix)
self.assertRaises(StopIteration, cur.next)
-self.failUnless(cur.rowcount in (-1, 0))
+self.assertTrue(cur.rowcount in (-1, 0))
# cursor.next should raise an Error if called after
# executing a query that cannnot return rows
@@ -120,6 +120,6 @@ class PhoenixDatabaseAPI20Test(dbapi20.DatabaseAPI20Test):
self.assertEqual(r[0], 'Victoria Bitter', 'cursor.next retrieved
incorrect data')
# cursor.next should raise StopIteration if no more rows available
self.assertRaises(StopIteration, cur.next)
-self.failUnless(cur.rowcount in (-1, 1))
+self.assertTrue(cur.rowcount in (-1, 1))
finally:
con.close()
[phoenix-omid] branch master updated (3fa85b51 -> ba43c8e1)
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git
from 3fa85b51 OMID-221 Bump junit from 4.13 to 4.13.1
add ba43c8e1 OMID-222 Remove HBase1 support and update HBase 2 version to
2.4
No new revisions were added by this update.
Summary of changes:
.travis.yml| 4 +-
benchmarks/pom.xml | 14 +-
codahale-metrics/pom.xml | 8 +-
commit-table/pom.xml | 6 +-
common/pom.xml | 8 +-
examples/pom.xml | 12 +-
hbase-client/pom.xml | 32 +-
.../org/apache/omid/transaction/TestCellUtils.java | 3 +-
hbase-commit-table/pom.xml | 20 +-
hbase-common/pom.xml | 19 +-
.../org/apache/omid/transaction/CellUtils.java | 4 +-
hbase-coprocessor/pom.xml | 21 +-
.../hbase/coprocessor/BaseRegionObserver.java | 0
.../hbase/regionserver}/CompactorScanner.java | 4 +-
.../regionserver/RegionConnectionFactory.java | 5 +-
.../omid/transaction/CellSkipFilterBase.java | 4 +-
.../org/apache/omid/transaction/CompactorUtil.java | 14 +-
.../org/apache/omid/transaction/OmidCompactor.java | 12 +-
.../omid/transaction/OmidSnapshotFilter.java | 3 +-
.../TransactionVisibilityFilterBase.java | 4 +-
.../apache/omid/transaction/TestCompaction.java| 7 +-
hbase-shims/hbase-1/pom.xml| 47 ---
.../controller/InterRegionServerRpcController.java | 50 ---
.../InterRegionServerRpcControllerFactory.java | 63
.../src/main/java/org/apache/omid/HBaseShims.java | 106 ---
.../main/java/org/apache/omid/OmidFilterBase.java | 37 ---
.../main/java/org/apache/omid/RegionWrapper.java | 52 ---
hbase-shims/hbase-2/pom.xml| 47 ---
.../controller/InterRegionServerRpcController.java | 51 ---
.../InterRegionServerRpcControllerFactory.java | 63
.../src/main/java/org/apache/omid/HBaseShims.java | 110 ---
.../main/java/org/apache/omid/OmidFilterBase.java | 21 --
hbase-shims/pom.xml| 113 ---
hbase-tools/pom.xml| 17 +-
.../apache/omid/tools/hbase/OmidTableManager.java | 3 +-
metrics/pom.xml| 9 +-
pom.xml| 349 +
statemachine/pom.xml | 7 +-
timestamp-storage/pom.xml | 21 +-
transaction-client/pom.xml | 18 +-
tso-server/maven/assembly/bin.xml | 4 +-
tso-server/pom.xml | 36 +--
42 files changed, 424 insertions(+), 1004 deletions(-)
rename {hbase-shims/hbase-2 =>
hbase-coprocessor}/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java
(100%)
rename hbase-coprocessor/src/main/java/org/apache/{omid/transaction =>
hadoop/hbase/regionserver}/CompactorScanner.java (99%)
delete mode 100644 hbase-shims/hbase-1/pom.xml
delete mode 100644
hbase-shims/hbase-1/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcController.java
delete mode 100644
hbase-shims/hbase-1/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java
delete mode 100644
hbase-shims/hbase-1/src/main/java/org/apache/omid/HBaseShims.java
delete mode 100644
hbase-shims/hbase-1/src/main/java/org/apache/omid/OmidFilterBase.java
delete mode 100644
hbase-shims/hbase-1/src/main/java/org/apache/omid/RegionWrapper.java
delete mode 100644 hbase-shims/hbase-2/pom.xml
delete mode 100644
hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcController.java
delete mode 100644
hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java
delete mode 100644
hbase-shims/hbase-2/src/main/java/org/apache/omid/HBaseShims.java
delete mode 100644
hbase-shims/hbase-2/src/main/java/org/apache/omid/OmidFilterBase.java
delete mode 100644 hbase-shims/pom.xml
[phoenix] branch 5.1 updated: PHOENIX-6734 Revert default HBase version to 2.4.10
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new b74225a937 PHOENIX-6734 Revert default HBase version to 2.4.10 b74225a937 is described below commit b74225a937b9965c694e92b2cb1e15434e987cde Author: Istvan Toth AuthorDate: Thu Jun 16 10:02:15 2022 +0200 PHOENIX-6734 Revert default HBase version to 2.4.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 739b205dd3..9685467830 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 2.2.7 2.3.7 2.4.0 -2.4.11 +2.4.10 src/main/antlr3
[phoenix] branch master updated: PHOENIX-6734 Revert default HBase version to 2.4.10
This is an automated email from the ASF dual-hosted git repository. stoty 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 cab4db3c90 PHOENIX-6734 Revert default HBase version to 2.4.10 cab4db3c90 is described below commit cab4db3c90abc453d0b8f31092ceda5f5a57f82f Author: Istvan Toth AuthorDate: Thu Jun 16 10:02:15 2022 +0200 PHOENIX-6734 Revert default HBase version to 2.4.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d0a2fa8a29..5fa65a6d26 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 2.3.7 2.4.0 -2.4.11 +2.4.10 src/main/antlr3
[phoenix] branch 5.1 updated: PHOENIX-6710 Revert PHOENIX-3842 Turn on back default bloomFilter for Phoenix Tables (#1436)
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new dcfb257077 PHOENIX-6710 Revert PHOENIX-3842 Turn on back default
bloomFilter for Phoenix Tables (#1436)
dcfb257077 is described below
commit dcfb257077d0161f532dfe9ca793fc076be29eee
Author: Ankit Singhal
AuthorDate: Tue May 10 20:56:00 2022 -0700
PHOENIX-6710 Revert PHOENIX-3842 Turn on back default bloomFilter for
Phoenix Tables (#1436)
---
.../src/it/java/org/apache/phoenix/end2end/CreateTableIT.java | 6 +++---
.../java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 4 +---
.../org/apache/phoenix/schema/tool/SchemaExtractionProcessor.java | 6 --
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
index fd48e5fb68..53db200d63 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
@@ -264,7 +264,7 @@ public class CreateTableIT extends ParallelStatsDisabledIT {
assertNotNull(admin.getDescriptor(TableName.valueOf(tableName)));
ColumnFamilyDescriptor[] columnFamilies =
admin.getDescriptor(TableName.valueOf(tableName)).getColumnFamilies();
-assertEquals(BloomType.NONE, columnFamilies[0].getBloomFilterType());
+assertEquals(BloomType.ROW, columnFamilies[0].getBloomFilterType());
try (Connection conn = DriverManager.getConnection(getUrl(), props);) {
conn.createStatement().execute(ddl);
@@ -527,14 +527,14 @@ public class CreateTableIT extends
ParallelStatsDisabledIT {
"create table IF NOT EXISTS " + tableName + " (" + " id
char(1) NOT NULL,"
+ " col1 integer NOT NULL," + " col2 bigint NOT NULL,"
+ " CONSTRAINT NAME_PK PRIMARY KEY (id, col1, col2)"
-+ " ) BLOOMFILTER = 'ROW', SALT_BUCKETS = 4";
++ " ) BLOOMFILTER = 'NONE', SALT_BUCKETS = 4";
Properties props = new Properties();
Connection conn = DriverManager.getConnection(getUrl(), props);
conn.createStatement().execute(ddl);
Admin admin = driver.getConnectionQueryServices(getUrl(),
props).getAdmin();
ColumnFamilyDescriptor[] columnFamilies =
admin.getDescriptor(TableName.valueOf(tableName)).getColumnFamilies();
-assertEquals(BloomType.ROW, columnFamilies[0].getBloomFilterType());
+assertEquals(BloomType.NONE, columnFamilies[0].getBloomFilterType());
}
/**
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 202bad9148..68fe9bda71 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
@@ -149,7 +149,6 @@ import
org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils.BlockingRpcCallback;
import org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory;
import org.apache.hadoop.hbase.ipc.ServerRpcController;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto;
-import org.apache.hadoop.hbase.regionserver.BloomType;
import org.apache.hadoop.hbase.regionserver.IndexHalfStoreFileReaderGenerator;
import org.apache.hadoop.hbase.security.AccessDeniedException;
import org.apache.hadoop.hbase.security.User;
@@ -844,7 +843,6 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
ColumnFamilyDescriptorBuilder columnDescBuilder =
ColumnFamilyDescriptorBuilder.newBuilder(family.getFirst());
if (tableType != PTableType.VIEW) {
columnDescBuilder.setDataBlockEncoding(SchemaUtil.DEFAULT_DATA_BLOCK_ENCODING);
-columnDescBuilder.setBloomFilterType(BloomType.NONE);
for (Entry entry : family.getSecond().entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
@@ -4323,7 +4321,7 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
} catch (TableAlreadyExistsException e) {
// take snapshot first
takeSnapshotOfSysTable(systemTableToSnapshotMap, e);
-if(UpgradeUtil.tableHasKeepDeleted(
+if (UpgradeUtil.tableHasKeepDeleted(
metaConnection, PhoenixDatabaseMetaData.SYSTEM_LOG_NAME) ) {
try (Statement stmt = metaConnection.createStatement())
[phoenix] branch 5.1 updated: PHOENIX-6705 PagedRegionScanner#next throws NPE if pagedFilter is not initialized. (#1433)
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new fb1925debc PHOENIX-6705 PagedRegionScanner#next throws NPE if
pagedFilter is not initialized. (#1433)
fb1925debc is described below
commit fb1925debc3bead550f9e6a84c24e7577eaebd9f
Author: Rushabh Shah
AuthorDate: Wed May 11 13:58:22 2022 -0700
PHOENIX-6705 PagedRegionScanner#next throws NPE if pagedFilter is not
initialized. (#1433)
Co-authored-by: Rushabh Shah
---
.../main/java/org/apache/phoenix/coprocessor/PagedRegionScanner.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PagedRegionScanner.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PagedRegionScanner.java
index 2b8b6b66aa..9e4e0d625d 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PagedRegionScanner.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PagedRegionScanner.java
@@ -81,7 +81,9 @@ public class PagedRegionScanner extends BaseRegionScanner {
return true;
}
} catch (Exception e) {
-pageFilter.init();
+if (pageFilter != null) {
+pageFilter.init();
+}
throw e;
}
}
[phoenix] branch master updated: PHOENIX-6717 Remove Hbase 2.1 and 2.2 from post-commit Jenkins job
This is an automated email from the ASF dual-hosted git repository.
stoty 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 8aa825ed88 PHOENIX-6717 Remove Hbase 2.1 and 2.2 from post-commit
Jenkins job
8aa825ed88 is described below
commit 8aa825ed88828a99d40fdb68eb2f930981cd8a6b
Author: Istvan Toth
AuthorDate: Wed May 18 06:11:54 2022 +0200
PHOENIX-6717 Remove Hbase 2.1 and 2.2 from post-commit Jenkins job
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7521e48c8a..aa098ba604 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
axes {
axis {
name 'HBASE_PROFILE'
-values '2.1', '2.2', '2.3', '2.4'
+values '2.3', '2.4'
}
}
[phoenix] branch master updated: PHOENIX-6703 Exclude Jetty and servlet-api from phoenix-client
This is an automated email from the ASF dual-hosted git repository.
stoty 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 76bbf91fb1 PHOENIX-6703 Exclude Jetty and servlet-api from
phoenix-client
76bbf91fb1 is described below
commit 76bbf91fb1e606bbd6ee3c2abb03c6d123b1f46c
Author: Istvan Toth
AuthorDate: Tue May 3 15:44:56 2022 +0200
PHOENIX-6703 Exclude Jetty and servlet-api from phoenix-client
---
.../phoenix-client-embedded/pom.xml| 37 ++
phoenix-client-parent/pom.xml | 7 ++--
pom.xml| 2 ++
3 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/phoenix-client-parent/phoenix-client-embedded/pom.xml
b/phoenix-client-parent/phoenix-client-embedded/pom.xml
index 74aacf16e7..50cecce512 100644
--- a/phoenix-client-parent/phoenix-client-embedded/pom.xml
+++ b/phoenix-client-parent/phoenix-client-embedded/pom.xml
@@ -94,5 +94,42 @@
phoenix-hbase-compat-${hbase.compat.version}
false
+
+
+ org.eclipse.jetty
+ jetty-server
+ provided
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-util
+ provided
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-util-ajax
+ provided
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-servlet
+ provided
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-webapp
+ provided
+ ${jetty.version}
+
+
+ javax.servlet
+ javax.servlet-api
+ provided
+ ${javax.servlet-api.version}
+
diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml
index 9a27aea2e8..af49cb3e47 100644
--- a/phoenix-client-parent/pom.xml
+++ b/phoenix-client-parent/pom.xml
@@ -157,7 +157,8 @@
org/omg/**
org/w3c/dom/**
org/xml/sax/**
-
+
+ org/eclipse/jetty/**
org/apache/hbase/**
@@ -204,8 +205,8 @@
${shaded.package}.javax.cache.
-javax/servlet/
-${shaded.package}.javax.servlet.
+javax/servlet/jsp/
+
${shaded.package}.javax.servlet.jsp.
javax/ws/
diff --git a/pom.xml b/pom.xml
index f669008b24..034f71de20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,6 +125,8 @@
4.0.0
1.0.55
0.9.3-1
+9.4.46.v20220331
+3.1.0
1.10.19
4.13.1
[phoenix] branch 5.1 updated: PHOENIX-6699 Phoenix metrics overwriting DefaultMetricsSystem in RegionServers (addendum: set up hbase prefix for ITs)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new 95d0ec864e PHOENIX-6699 Phoenix metrics overwriting DefaultMetricsSystem in RegionServers (addendum: set up hbase prefix for ITs) 95d0ec864e is described below commit 95d0ec864e3102ea11b32a8bd8a90d2db3373a22 Author: Istvan Toth AuthorDate: Tue May 10 08:02:38 2022 +0200 PHOENIX-6699 Phoenix metrics overwriting DefaultMetricsSystem in RegionServers (addendum: set up hbase prefix for ITs) --- phoenix-core/src/test/resources/hadoop-metrics2.properties | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/test/resources/hadoop-metrics2.properties b/phoenix-core/src/test/resources/hadoop-metrics2.properties index 27cadc9ef1..4eaf15791b 100644 --- a/phoenix-core/src/test/resources/hadoop-metrics2.properties +++ b/phoenix-core/src/test/resources/hadoop-metrics2.properties @@ -20,8 +20,11 @@ # Either will be loaded by the metrics system (but not both). # # NOTE: The metrics system is only initialized once per JVM (but does ref-counting, so we can't -#shutdown and restart), so we only load the first prefix that we find. Generally, this will be -#phoenix (unless someone else registers first, but for many clients, there should only be one). +# shutdown and restart), so we only load the first prefix that we find. Generally, this will be +# phoenix (unless someone else registers first, but for many clients, there should only be one). +# +# Since PHOENIX-6699 we do not overwrite the hbase prefix created by HBase in the minicluster, +# so we set up both the hbase or phoenix prefixes for the tests # # Usually, you would use hadoop-metrics2-phoenix.properties, but we use the generic # hadoop-metrics2.properties to ensure it these are loaded regardless of where we are running, @@ -35,6 +38,9 @@ phoenix.source.start_mbeans=true phoenix.sink.sink0.class=org.apache.phoenix.monitoring.GlobalPhoenixMetricsTestSink +hbase.source.start_mbeans=true +hbase.sink.sink0.class=org.apache.phoenix.monitoring.GlobalPhoenixMetricsTestSink + # Frequency, in seconds, of sampling from the sources # High Frequency for test purposes *.period=1
[phoenix] branch master updated: PHOENIX-6699 Phoenix metrics overwriting DefaultMetricsSystem in RegionServers (addendum: set up hbase prefix for ITs)
This is an automated email from the ASF dual-hosted git repository. stoty 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 8732c13f74 PHOENIX-6699 Phoenix metrics overwriting DefaultMetricsSystem in RegionServers (addendum: set up hbase prefix for ITs) 8732c13f74 is described below commit 8732c13f74bcfac1f12e7f4e676d50dadb5f81da Author: Istvan Toth AuthorDate: Tue May 10 08:02:38 2022 +0200 PHOENIX-6699 Phoenix metrics overwriting DefaultMetricsSystem in RegionServers (addendum: set up hbase prefix for ITs) --- phoenix-core/src/test/resources/hadoop-metrics2.properties | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/test/resources/hadoop-metrics2.properties b/phoenix-core/src/test/resources/hadoop-metrics2.properties index 27cadc9ef1..4eaf15791b 100644 --- a/phoenix-core/src/test/resources/hadoop-metrics2.properties +++ b/phoenix-core/src/test/resources/hadoop-metrics2.properties @@ -20,8 +20,11 @@ # Either will be loaded by the metrics system (but not both). # # NOTE: The metrics system is only initialized once per JVM (but does ref-counting, so we can't -#shutdown and restart), so we only load the first prefix that we find. Generally, this will be -#phoenix (unless someone else registers first, but for many clients, there should only be one). +# shutdown and restart), so we only load the first prefix that we find. Generally, this will be +# phoenix (unless someone else registers first, but for many clients, there should only be one). +# +# Since PHOENIX-6699 we do not overwrite the hbase prefix created by HBase in the minicluster, +# so we set up both the hbase or phoenix prefixes for the tests # # Usually, you would use hadoop-metrics2-phoenix.properties, but we use the generic # hadoop-metrics2.properties to ensure it these are loaded regardless of where we are running, @@ -35,6 +38,9 @@ phoenix.source.start_mbeans=true phoenix.sink.sink0.class=org.apache.phoenix.monitoring.GlobalPhoenixMetricsTestSink +hbase.source.start_mbeans=true +hbase.sink.sink0.class=org.apache.phoenix.monitoring.GlobalPhoenixMetricsTestSink + # Frequency, in seconds, of sampling from the sources # High Frequency for test purposes *.period=1
[phoenix] branch 5.1 updated: PHOENIX-6708 Bump junit from 4.13 to 4.13.1
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new 66d089ee19 PHOENIX-6708 Bump junit from 4.13 to 4.13.1 66d089ee19 is described below commit 66d089ee19ea932c6179f45454d1b2894b432cdd Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Sat Apr 16 03:55:35 2022 + PHOENIX-6708 Bump junit from 4.13 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.13...r4.13.1) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e01d824d63..739b205dd3 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ 0.9.3-1 1.10.19 -4.13 +4.13.1 1.3
[phoenix] branch master updated: PHOENIX-6708 Bump junit from 4.13 to 4.13.1
This is an automated email from the ASF dual-hosted git repository. stoty 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 4c5ee5308d PHOENIX-6708 Bump junit from 4.13 to 4.13.1 4c5ee5308d is described below commit 4c5ee5308dcfe38bd7e9ad2e5bd4636f652875d9 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Sat Apr 16 03:55:35 2022 + PHOENIX-6708 Bump junit from 4.13 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.13...r4.13.1) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ed9524210..f669008b24 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ 0.9.3-1 1.10.19 -4.13 +4.13.1 1.3
[phoenix] branch 5.1 updated: PHOENIX-6699 Phoenix metrics overwriting DefaultMetricsSystem in RegionServers
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new 2592cafe2c PHOENIX-6699 Phoenix metrics overwriting
DefaultMetricsSystem in RegionServers
2592cafe2c is described below
commit 2592cafe2cae2d671e2e24ea35722bcc57456f05
Author: Istvan Toth
AuthorDate: Thu Apr 28 07:21:33 2022 +0200
PHOENIX-6699 Phoenix metrics overwriting DefaultMetricsSystem in
RegionServers
---
.../monitoring/GlobalMetricRegistriesAdapter.java | 7 ++
.../org/apache/phoenix/monitoring/MetricUtil.java | 26 ++
.../apache/phoenix/monitoring/MetricUtilTest.java | 17 ++
3 files changed, 50 insertions(+)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricRegistriesAdapter.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricRegistriesAdapter.java
index 0f1c8c2744..4a9093511f 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricRegistriesAdapter.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricRegistriesAdapter.java
@@ -53,6 +53,13 @@ public class GlobalMetricRegistriesAdapter {
private static GlobalMetricRegistriesAdapter INSTANCE = new
GlobalMetricRegistriesAdapter();
private GlobalMetricRegistriesAdapter() {
+if (MetricUtil.isDefaultMetricsInitialized()) {
+// Prevent clobbering the default metrics HBase has set up in
+// RS or Master while JmxCacheBuster shuts the Metrics down
+LOGGER.info("HBase metrics is already initialized. "
++ "Skipping Phoenix metrics initialization.");
+return;
+}
DefaultMetricsSystem.initialize("Phoenix");
JvmMetrics.initSingleton("Phoenix", "");
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/MetricUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/MetricUtil.java
index 1974eb806e..bbe5f2a46e 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/MetricUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/MetricUtil.java
@@ -17,11 +17,19 @@
*/
package org.apache.phoenix.monitoring;
+import java.lang.reflect.Field;
+
+import org.apache.hadoop.metrics2.impl.MetricsSystemImpl;
+import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.phoenix.log.LogLevel;
import org.apache.phoenix.monitoring.CombinableMetric.NoOpRequestMetric;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MetricUtil {
+private static final Logger LOGGER =
LoggerFactory.getLogger(MetricUtil.class);
+
public static CombinableMetric getCombinableMetric(boolean
isRequestMetricsEnabled,
LogLevel
connectionLogLevel,
MetricType type) {
@@ -38,4 +46,22 @@ public class MetricUtil {
return new MetricsStopWatch(true);
}
+// We need to cover the case when JmxCacheBuster has just stopped the
HBase metrics
+// system, and not accidentally overwrite the DefaultMetricsSystem
singleton.
+// See PHOENIX-6699
+public static boolean isDefaultMetricsInitialized() {
+try {
+MetricsSystemImpl metrics = (MetricsSystemImpl)
DefaultMetricsSystem.instance();
+Field prefixField =
MetricsSystemImpl.class.getDeclaredField("prefix");
+prefixField.setAccessible(true);
+String prefix = (String) prefixField.get(metrics);
+prefixField.setAccessible(false);
+if (prefix != null) {
+return true;
+}
+} catch (Exception e) {
+LOGGER.error("Exception trying to determine if HBase metrics is
initialized", e);
+}
+return false;
+}
}
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/monitoring/MetricUtilTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/monitoring/MetricUtilTest.java
index 141ce724d1..3e44ecfceb 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/monitoring/MetricUtilTest.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/monitoring/MetricUtilTest.java
@@ -17,6 +17,8 @@
*/
package org.apache.phoenix.monitoring;
+import org.apache.hadoop.metrics2.impl.MetricsSystemImpl;
+import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.phoenix.log.LogLevel;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -27,6 +29,8 @@ import static
org.apache.phoenix.monitoring.MetricType.WALL_CLOCK_TIME_MS;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import java.lang.reflect.Field;
+
@RunWith(Mock
[phoenix] branch master updated: PHOENIX-6699 Phoenix metrics overwriting DefaultMetricsSystem in RegionServers
This is an automated email from the ASF dual-hosted git repository.
stoty 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 58b6935884 PHOENIX-6699 Phoenix metrics overwriting
DefaultMetricsSystem in RegionServers
58b6935884 is described below
commit 58b693588403a576334460f13612efd94d0c7e64
Author: Istvan Toth
AuthorDate: Thu Apr 28 07:21:33 2022 +0200
PHOENIX-6699 Phoenix metrics overwriting DefaultMetricsSystem in
RegionServers
---
.../monitoring/GlobalMetricRegistriesAdapter.java | 7 ++
.../org/apache/phoenix/monitoring/MetricUtil.java | 26 ++
.../apache/phoenix/monitoring/MetricUtilTest.java | 17 ++
3 files changed, 50 insertions(+)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricRegistriesAdapter.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricRegistriesAdapter.java
index 0f1c8c2744..4a9093511f 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricRegistriesAdapter.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetricRegistriesAdapter.java
@@ -53,6 +53,13 @@ public class GlobalMetricRegistriesAdapter {
private static GlobalMetricRegistriesAdapter INSTANCE = new
GlobalMetricRegistriesAdapter();
private GlobalMetricRegistriesAdapter() {
+if (MetricUtil.isDefaultMetricsInitialized()) {
+// Prevent clobbering the default metrics HBase has set up in
+// RS or Master while JmxCacheBuster shuts the Metrics down
+LOGGER.info("HBase metrics is already initialized. "
++ "Skipping Phoenix metrics initialization.");
+return;
+}
DefaultMetricsSystem.initialize("Phoenix");
JvmMetrics.initSingleton("Phoenix", "");
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/MetricUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/MetricUtil.java
index 1974eb806e..bbe5f2a46e 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/MetricUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/MetricUtil.java
@@ -17,11 +17,19 @@
*/
package org.apache.phoenix.monitoring;
+import java.lang.reflect.Field;
+
+import org.apache.hadoop.metrics2.impl.MetricsSystemImpl;
+import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.phoenix.log.LogLevel;
import org.apache.phoenix.monitoring.CombinableMetric.NoOpRequestMetric;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MetricUtil {
+private static final Logger LOGGER =
LoggerFactory.getLogger(MetricUtil.class);
+
public static CombinableMetric getCombinableMetric(boolean
isRequestMetricsEnabled,
LogLevel
connectionLogLevel,
MetricType type) {
@@ -38,4 +46,22 @@ public class MetricUtil {
return new MetricsStopWatch(true);
}
+// We need to cover the case when JmxCacheBuster has just stopped the
HBase metrics
+// system, and not accidentally overwrite the DefaultMetricsSystem
singleton.
+// See PHOENIX-6699
+public static boolean isDefaultMetricsInitialized() {
+try {
+MetricsSystemImpl metrics = (MetricsSystemImpl)
DefaultMetricsSystem.instance();
+Field prefixField =
MetricsSystemImpl.class.getDeclaredField("prefix");
+prefixField.setAccessible(true);
+String prefix = (String) prefixField.get(metrics);
+prefixField.setAccessible(false);
+if (prefix != null) {
+return true;
+}
+} catch (Exception e) {
+LOGGER.error("Exception trying to determine if HBase metrics is
initialized", e);
+}
+return false;
+}
}
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/monitoring/MetricUtilTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/monitoring/MetricUtilTest.java
index 141ce724d1..3e44ecfceb 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/monitoring/MetricUtilTest.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/monitoring/MetricUtilTest.java
@@ -17,6 +17,8 @@
*/
package org.apache.phoenix.monitoring;
+import org.apache.hadoop.metrics2.impl.MetricsSystemImpl;
+import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.phoenix.log.LogLevel;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -27,6 +29,8 @@ import static
org.apache.phoenix.monitoring.MetricType.WALL_CLOCK_TIME_MS;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import java.lang.reflect.Field;
+
@RunWi
[phoenix-queryserver] branch master updated: PHOENIX-6704 sqlline-thin.py doesn't work woth python3
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git
The following commit(s) were added to refs/heads/master by this push:
new bbe0433 PHOENIX-6704 sqlline-thin.py doesn't work woth python3
bbe0433 is described below
commit bbe0433d61064030f5dfb67a9c5160a6ee8cf50f
Author: Istvan Toth
AuthorDate: Tue May 3 16:02:25 2022 +0200
PHOENIX-6704 sqlline-thin.py doesn't work woth python3
---
bin/phoenix_queryserver_utils.py | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/bin/phoenix_queryserver_utils.py b/bin/phoenix_queryserver_utils.py
index 02db08b..e62d1d1 100755
--- a/bin/phoenix_queryserver_utils.py
+++ b/bin/phoenix_queryserver_utils.py
@@ -192,15 +192,15 @@ def common_sqlline_args(parser):
if __name__ == "__main__":
setPath()
-print "phoenix_class_path:", phoenix_class_path
-print "hbase_conf_dir:", hbase_conf_dir
-print "hbase_conf_path:", hbase_conf_path
-print "hadoop_conf_dir:", hadoop_conf_dir
-print "current_dir:", current_dir
-print "phoenix_client_jar:", phoenix_client_jar
-print "phoenix_queryserver_jar:", phoenix_queryserver_jar
-print "phoenix_loadbalancer_jar:", phoenix_loadbalancer_jar
-print "phoenix_queryserver_classpath", phoenix_queryserver_classpath
-print "phoenix_thin_client_jar:", phoenix_thin_client_jar
-print "sqlline_with_deps_jar", sqlline_with_deps_jar
-print "slf4j_backend_jar:", slf4j_backend_jar
+print("phoenix_class_path:", phoenix_class_path)
+print("hbase_conf_dir:", hbase_conf_dir)
+print("hbase_conf_path:", hbase_conf_path)
+print("hadoop_conf_dir:", hadoop_conf_dir)
+print("current_dir:", current_dir)
+print("phoenix_client_jar:", phoenix_client_jar)
+print("phoenix_queryserver_jar:", phoenix_queryserver_jar)
+print("phoenix_loadbalancer_jar:", phoenix_loadbalancer_jar)
+print("phoenix_queryserver_classpath", phoenix_queryserver_classpath)
+print("phoenix_thin_client_jar:", phoenix_thin_client_jar)
+print("sqlline_with_deps_jar", sqlline_with_deps_jar)
+print("slf4j_backend_jar:", slf4j_backend_jar)
[phoenix] branch master updated: PHOENIX-6696 Drop legacy phoenix-client jar
This is an automated email from the ASF dual-hosted git repository.
stoty 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 f9f91f0b48 PHOENIX-6696 Drop legacy phoenix-client jar
f9f91f0b48 is described below
commit f9f91f0b487a866a9b4b9c46bae3d90fdb91a5c6
Author: Istvan Toth
AuthorDate: Wed Apr 27 08:05:57 2022 +0200
PHOENIX-6696 Drop legacy phoenix-client jar
---
phoenix-assembly/pom.xml | 25 --
.../src/build/components/all-common-jars.xml | 16
phoenix-client-parent/phoenix-client/pom.xml | 94 --
pom.xml| 26 --
4 files changed, 161 deletions(-)
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 00d95ff7fe..8c69d861fd 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -40,27 +40,6 @@
exec-maven-plugin
org.codehaus.mojo
-
-client without version
-compile
-
- exec
-
-
- ln
-
${project.basedir}/../phoenix-client-parent/phoenix-client/target
-
--fnsv
-
- phoenix-client-${hbase.suffix}-${project.version}.jar
-
-
-
- phoenix-client-${hbase.suffix}.jar
-
-
-
-
embedded client without version
compile
@@ -168,10 +147,6 @@
org.apache.phoenix
phoenix-server-${hbase.suffix}
-
- org.apache.phoenix
- phoenix-client-${hbase.suffix}
-
org.apache.phoenix
phoenix-client-embedded-${hbase.suffix}
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml
b/phoenix-assembly/src/build/components/all-common-jars.xml
index 4afb7e683c..1a6abd3193 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -23,14 +23,6 @@
-
-
${project.basedir}/../phoenix-client-parent/phoenix-client/target
- /
-
-
phoenix-client-${hbase.suffix}-${project.version}.jar
-phoenix-client-${hbase.suffix}.jar
-
-
${project.basedir}/../phoenix-client-parent/phoenix-client-embedded/target
/
@@ -55,13 +47,5 @@
phoenix-pherf.jar
-
- ${project.basedir}/../phoenix-tools/target
- /
-
-phoenix-tools-${project.version}.jar
-phoenix-tools.jar
-
-
diff --git a/phoenix-client-parent/phoenix-client/pom.xml
b/phoenix-client-parent/phoenix-client/pom.xml
deleted file mode 100644
index 415b4fd79f..00
--- a/phoenix-client-parent/phoenix-client/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
- 4.0.0
-
-org.apache.phoenix
-phoenix-client-parent
-5.2.0-SNAPSHOT
-
-
- phoenix-client-${hbase.suffix}
- Phoenix Client
- Phoenix Client
- jar
-
-
-
-
-org.apache.maven.plugins
-maven-shade-plugin
-
-
-default-shaded
-package
-
- shade
-
-
-
true
- false
- true
-
${basedir}/target/pom.xml
-
-
- *:*
-
-
- org.apache.phoenix:phoenix-client
- xom:xom
-
-
-
-
-
-
-
-
-
-
-
-
-
- org.apache.phoenix
- phoenix-core
-
-
- org.apache.phoenix
- phoenix-hbase-compat-${hbase.compat.version}
- false
-
-
- org.slf4j
- slf4j-reload4j
- runtime
-
-
- ch.qos.reload4j
- reload4j
- runtime
-
-
- sqlline
- sqlline
- runtime
-
-
-
diff --git a/pom.xml b/pom.xml
index 3c0ea72316..35fc769399 100644
--- a/pom.xml
+++ b/pom.xml
@@ -638,31 +638,6 @@
phoenix-core
${project.version}
-
-org.apache.phoenix
-phoenix-client-hbase-2.1
-${project.version}
-
-
-org.apache.phoenix
-phoenix-client-hbase-2.2
-${project.version}
-
-
-org.apache.phoenix
-phoenix-client-hbase-2.3
-${project.version}
-
-
-org.apache.phoenix
-phoenix-client-hbase-2.4.0
-${project.version}
-
-
-org.a
[phoenix] branch 4.16 updated: PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push:
new 02b3eee010 PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly
02b3eee010 is described below
commit 02b3eee010f28c15f4f5f4196b870bbd3e2e2e2f
Author: Istvan Toth
AuthorDate: Wed Apr 27 09:13:11 2022 +0200
PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly
also remove obsolete dependencies from assembly pom.xml
---
phoenix-assembly/pom.xml | 9 ++---
.../src/build/components/all-common-dependencies.xml | 2 ++
phoenix-assembly/src/build/package-to-tar-all.xml | 11 ---
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 97ecfb619e..ef86c70ad3 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -144,9 +144,12 @@
phoenix-tracing-webapp
- org.apache.omid
- omid-hbase-tools-hbase1.x
- ${omid.version}
+ org.slf4j
+ slf4j-reload4j
+
+
+ ch.qos.reload4j
+ reload4j
sqlline
diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml
b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index 5381c88529..84fcd0a58d 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -24,6 +24,8 @@
/lib
sqlline:sqlline:jar:jar-with-dependencies
+org.slf4j:slf4j-reload4j
+ch.qos.reload4j:reload4j
diff --git a/phoenix-assembly/src/build/package-to-tar-all.xml
b/phoenix-assembly/src/build/package-to-tar-all.xml
index e03d4e86d1..9683ea714b 100644
--- a/phoenix-assembly/src/build/package-to-tar-all.xml
+++ b/phoenix-assembly/src/build/package-to-tar-all.xml
@@ -31,17 +31,6 @@
true
-
-
- false
- /lib
-
-org.slf4j:slf4j-reload4j
-ch.qos.reload4j:reload4j
-
-
-
-
src/build/components/all-common-jars.xml
src/build/components/all-common-files.xml
[phoenix] branch 4.x updated: PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new 2a948225ea PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly
2a948225ea is described below
commit 2a948225ea5a7a17b839b70062f372c80cb8a878
Author: Istvan Toth
AuthorDate: Wed Apr 27 09:13:11 2022 +0200
PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly
also remove obsolete dependencies from assembly pom.xml
---
phoenix-assembly/pom.xml | 9 ++---
.../src/build/components/all-common-dependencies.xml | 2 ++
phoenix-assembly/src/build/package-to-tar-all.xml | 11 ---
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 2f46087355..6b33c70213 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -144,9 +144,12 @@
phoenix-tracing-webapp
- org.apache.omid
- omid-hbase-tools-hbase1.x
- ${omid.version}
+ org.slf4j
+ slf4j-reload4j
+
+
+ ch.qos.reload4j
+ reload4j
sqlline
diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml
b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index 5381c88529..84fcd0a58d 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -24,6 +24,8 @@
/lib
sqlline:sqlline:jar:jar-with-dependencies
+org.slf4j:slf4j-reload4j
+ch.qos.reload4j:reload4j
diff --git a/phoenix-assembly/src/build/package-to-tar-all.xml
b/phoenix-assembly/src/build/package-to-tar-all.xml
index e03d4e86d1..9683ea714b 100644
--- a/phoenix-assembly/src/build/package-to-tar-all.xml
+++ b/phoenix-assembly/src/build/package-to-tar-all.xml
@@ -31,17 +31,6 @@
true
-
-
- false
- /lib
-
-org.slf4j:slf4j-reload4j
-ch.qos.reload4j:reload4j
-
-
-
-
src/build/components/all-common-jars.xml
src/build/components/all-common-files.xml
[phoenix] branch 5.1 updated: PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new 73e1ed6789 PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly
73e1ed6789 is described below
commit 73e1ed6789aceb93f6046bccd1d5bde2fbae03f8
Author: Istvan Toth
AuthorDate: Wed Apr 27 09:13:11 2022 +0200
PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly
also remove obsolete dependencies from assembly pom.xml
---
phoenix-assembly/pom.xml | 43 ++
.../build/components/all-common-dependencies.xml | 2 +
phoenix-assembly/src/build/package-to-tar-all.xml | 11 --
3 files changed, 6 insertions(+), 50 deletions(-)
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 4de74a302c..481f2507a6 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -186,48 +186,13 @@
- com.fasterxml.woodstox
- woodstox-core
- 5.2.0
+ org.slf4j
+ slf4j-reload4j
-
-
- org.codehaus.woodstox
- stax2-api
- 3.0.1
-
-
-
- org.apache.commons
- commons-configuration2
-
-
-
- org.apache.hbase.thirdparty
- hbase-shaded-miscellaneous
-
-
- org.apache.hbase.thirdparty
- hbase-shaded-protobuf
+ ch.qos.reload4j
+ reload4j
-
-
- org.apache.hbase.thirdparty
- hbase-shaded-netty
- ${hbase.thirdparty.version}
-
-
-
- org.apache.commons
- commons-lang3
-
-
-
- org.apache.htrace
- htrace-core
-
-
sqlline
sqlline
diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml
b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index 5381c88529..84fcd0a58d 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -24,6 +24,8 @@
/lib
sqlline:sqlline:jar:jar-with-dependencies
+org.slf4j:slf4j-reload4j
+ch.qos.reload4j:reload4j
diff --git a/phoenix-assembly/src/build/package-to-tar-all.xml
b/phoenix-assembly/src/build/package-to-tar-all.xml
index e03d4e86d1..9683ea714b 100644
--- a/phoenix-assembly/src/build/package-to-tar-all.xml
+++ b/phoenix-assembly/src/build/package-to-tar-all.xml
@@ -31,17 +31,6 @@
true
-
-
- false
- /lib
-
-org.slf4j:slf4j-reload4j
-ch.qos.reload4j:reload4j
-
-
-
-
src/build/components/all-common-jars.xml
src/build/components/all-common-files.xml
[phoenix] branch master updated: PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly
This is an automated email from the ASF dual-hosted git repository.
stoty 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 348d6d803c PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly
348d6d803c is described below
commit 348d6d803cbfa39ccdf0450db4cf98de091f9ad4
Author: Istvan Toth
AuthorDate: Wed Apr 27 09:13:11 2022 +0200
PHOENIX-6697 log4j-reload4j is missing from phoenix-assembly
also remove obsolete dependencies from assembly pom.xml
---
phoenix-assembly/pom.xml | 43 ++
.../build/components/all-common-dependencies.xml | 2 +
phoenix-assembly/src/build/package-to-tar-all.xml | 11 --
3 files changed, 6 insertions(+), 50 deletions(-)
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 7af1c0cc7d..00d95ff7fe 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -186,48 +186,13 @@
- com.fasterxml.woodstox
- woodstox-core
- 5.2.0
+ org.slf4j
+ slf4j-reload4j
-
-
- org.codehaus.woodstox
- stax2-api
- 3.0.1
-
-
-
- org.apache.commons
- commons-configuration2
-
-
-
- org.apache.hbase.thirdparty
- hbase-shaded-miscellaneous
-
-
- org.apache.hbase.thirdparty
- hbase-shaded-protobuf
+ ch.qos.reload4j
+ reload4j
-
-
- org.apache.hbase.thirdparty
- hbase-shaded-netty
- ${hbase.thirdparty.version}
-
-
-
- org.apache.commons
- commons-lang3
-
-
-
- org.apache.htrace
- htrace-core
-
-
sqlline
sqlline
diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml
b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index 5381c88529..84fcd0a58d 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -24,6 +24,8 @@
/lib
sqlline:sqlline:jar:jar-with-dependencies
+org.slf4j:slf4j-reload4j
+ch.qos.reload4j:reload4j
diff --git a/phoenix-assembly/src/build/package-to-tar-all.xml
b/phoenix-assembly/src/build/package-to-tar-all.xml
index e03d4e86d1..9683ea714b 100644
--- a/phoenix-assembly/src/build/package-to-tar-all.xml
+++ b/phoenix-assembly/src/build/package-to-tar-all.xml
@@ -31,17 +31,6 @@
true
-
-
- false
- /lib
-
-org.slf4j:slf4j-reload4j
-ch.qos.reload4j:reload4j
-
-
-
-
src/build/components/all-common-jars.xml
src/build/components/all-common-files.xml
[phoenix-omid] branch master updated (cec69d01 -> 3fa85b51)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git from cec69d01 OMID-220 Update netty to 4.1.76.Final add 3fa85b51 OMID-221 Bump junit from 4.13 to 4.13.1 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[phoenix-connectors] branch master updated: PHOENIX-6691 Update Connectors to Phoenix-thirdparty 2.0.0
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git The following commit(s) were added to refs/heads/master by this push: new 9ed127f PHOENIX-6691 Update Connectors to Phoenix-thirdparty 2.0.0 9ed127f is described below commit 9ed127fd6e253d93e78b09f2543c37dbb0c19037 Author: Istvan Toth AuthorDate: Wed Apr 20 07:34:59 2022 +0200 PHOENIX-6691 Update Connectors to Phoenix-thirdparty 2.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28183b3..2d1e693 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 4.16.0 5.1.2 -1.1.0 +2.0.0 1.4.10 1.4.0
[phoenix-omid] branch master updated: OMID-220 Update netty to 4.1.76.Final
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git The following commit(s) were added to refs/heads/master by this push: new cec69d01 OMID-220 Update netty to 4.1.76.Final cec69d01 is described below commit cec69d01c30b56f91d622a405cb31e25373ce475 Author: Istvan Toth AuthorDate: Tue Apr 19 14:59:12 2022 +0200 OMID-220 Update netty to 4.1.76.Final --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d56c9e89..f1c78302 100644 --- a/pom.xml +++ b/pom.xml @@ -175,7 +175,7 @@ 6.10 1.7.7 1.2.17 -4.1.60.Final +4.1.76.Final com.google.protobuf 2.5.0
[phoenix-omid] branch master updated: OMID-219 Update to phoenix-thirdparty 2.0
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git The following commit(s) were added to refs/heads/master by this push: new 6f9a1508 OMID-219 Update to phoenix-thirdparty 2.0 6f9a1508 is described below commit 6f9a15086d18fe35ee0294960ac5b45fe1b6c20c Author: Istvan Toth AuthorDate: Tue Apr 19 10:54:17 2022 +0200 OMID-219 Update to phoenix-thirdparty 2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bece3490..d56c9e89 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,7 @@ 2.0.1 2.7.5 3.0.0 -1.0.0 +2.0.0 3.0 6.10 1.7.7
[phoenix] branch 5.1 updated: PHOENIX-6690 Bump HBase 2.4 version to 2.4.11
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/5.1 by this push: new 173290308b PHOENIX-6690 Bump HBase 2.4 version to 2.4.11 173290308b is described below commit 173290308b5ba6a177830add00a9385f3792cc0e Author: Istvan Toth AuthorDate: Tue Apr 19 09:13:46 2022 +0200 PHOENIX-6690 Bump HBase 2.4 version to 2.4.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4811e18d85..e01d824d63 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 2.2.7 2.3.7 2.4.0 -2.4.8 +2.4.11 src/main/antlr3
[phoenix] branch master updated: PHOENIX-6690 Bump HBase 2.4 version to 2.4.11
This is an automated email from the ASF dual-hosted git repository. stoty 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 435b87b826 PHOENIX-6690 Bump HBase 2.4 version to 2.4.11 435b87b826 is described below commit 435b87b826280b6135a5d7066a66148ff6a59b23 Author: Istvan Toth AuthorDate: Tue Apr 19 09:13:46 2022 +0200 PHOENIX-6690 Bump HBase 2.4 version to 2.4.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dd5aebf1bc..3c0ea72316 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 2.2.7 2.3.7 2.4.0 -2.4.8 +2.4.11 src/main/antlr3
[phoenix] branch 4.x updated: PHOENIX-6588 Update to phoenix-thirdparty 2.0.0
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new 752cf6cbc4 PHOENIX-6588 Update to phoenix-thirdparty 2.0.0
752cf6cbc4 is described below
commit 752cf6cbc4081e0399abc43620421df4220e8453
Author: Istvan Toth
AuthorDate: Mon Nov 8 10:56:03 2021 +0100
PHOENIX-6588 Update to phoenix-thirdparty 2.0.0
---
.../main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java | 5 -
.../src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java | 5 -
.../src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java | 5 -
.../java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java | 5 -
.../src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java | 5 -
.../java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java| 5 -
.../java/org/apache/phoenix/schema/stats/UpdateStatisticsTool.java | 5 -
.../src/main/java/org/apache/phoenix/schema/tool/SchemaTool.java | 5 -
.../java/org/apache/phoenix/util/MergeViewIndexIdSequencesTool.java | 5 -
.../src/main/java/org/apache/phoenix/util/PhoenixRuntime.java| 5 -
phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java | 5 -
pom.xml | 2 +-
12 files changed, 45 insertions(+), 12 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index bae5982ca6..69eca86fe3 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -125,7 +125,10 @@ public abstract class AbstractBulkLoadTool extends
Configured implements Tool {
Options options = getOptions();
-CommandLineParser parser = new DefaultParser(false, false);
+CommandLineParser parser = DefaultParser.builder().
+setAllowPartialMatching(false).
+setStripLeadingAndTrailingQuotes(false).
+build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
index 3acfb0cb23..828fe1c67d 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
@@ -199,7 +199,10 @@ public class OrphanViewTool extends Configured implements
Tool {
final Options options = getOptions();
-CommandLineParser parser = new DefaultParser(false, false);
+CommandLineParser parser = DefaultParser.builder().
+setAllowPartialMatching(false).
+setStripLeadingAndTrailingQuotes(false).
+build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
index 0f432640b0..b8d6b8a326 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
@@ -173,7 +173,10 @@ public class PhoenixTTLTool extends Configured implements
Tool {
public CommandLine parseOptions(String[] args) {
final Options options = getOptions();
-CommandLineParser parser = new DefaultParser(false, false);
+CommandLineParser parser = DefaultParser.builder().
+setAllowPartialMatching(false).
+setStripLeadingAndTrailingQuotes(false).
+build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
index 4d3b6cd631..e337f7ea97 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
@@ -170,7 +170,10 @@ public class IndexScrutinyTool extends Configured
implements Tool {
private CommandLine parseOptions(String[] args) {
final Options options = getOptions();
-CommandLineParser parser = new DefaultParser(false, false);
+CommandLineParser parser = DefaultParser.builder
[phoenix] branch master updated: PHOENIX-6588 Update to phoenix-thirdparty 2.0.0
This is an automated email from the ASF dual-hosted git repository.
stoty 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 b17e39c454 PHOENIX-6588 Update to phoenix-thirdparty 2.0.0
b17e39c454 is described below
commit b17e39c454321671180f2c4f35994c77d96c6058
Author: Istvan Toth
AuthorDate: Mon Nov 8 10:56:03 2021 +0100
PHOENIX-6588 Update to phoenix-thirdparty 2.0.0
---
.../main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java | 5 -
.../src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java | 5 -
.../src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java | 5 -
.../java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java | 5 -
.../src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java | 5 -
.../java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java| 5 -
.../java/org/apache/phoenix/schema/stats/UpdateStatisticsTool.java | 5 -
.../src/main/java/org/apache/phoenix/schema/tool/SchemaTool.java | 5 -
.../java/org/apache/phoenix/util/MergeViewIndexIdSequencesTool.java | 5 -
.../src/main/java/org/apache/phoenix/util/PhoenixRuntime.java| 5 -
phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java | 5 -
pom.xml | 2 +-
12 files changed, 45 insertions(+), 12 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index 05a4116e81..00eff12caf 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -128,7 +128,10 @@ public abstract class AbstractBulkLoadTool extends
Configured implements Tool {
Options options = getOptions();
-CommandLineParser parser = new DefaultParser(false, false);
+CommandLineParser parser = DefaultParser.builder().
+setAllowPartialMatching(false).
+setStripLeadingAndTrailingQuotes(false).
+build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
index f16982269f..efa57d7e04 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
@@ -199,7 +199,10 @@ public class OrphanViewTool extends Configured implements
Tool {
final Options options = getOptions();
-CommandLineParser parser = new DefaultParser(false, false);
+CommandLineParser parser = DefaultParser.builder().
+setAllowPartialMatching(false).
+setStripLeadingAndTrailingQuotes(false).
+build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
index 0f432640b0..b8d6b8a326 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
@@ -173,7 +173,10 @@ public class PhoenixTTLTool extends Configured implements
Tool {
public CommandLine parseOptions(String[] args) {
final Options options = getOptions();
-CommandLineParser parser = new DefaultParser(false, false);
+CommandLineParser parser = DefaultParser.builder().
+setAllowPartialMatching(false).
+setStripLeadingAndTrailingQuotes(false).
+build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
index 1f775d6370..420027134c 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
@@ -170,7 +170,10 @@ public class IndexScrutinyTool extends Configured
implements Tool {
private CommandLine parseOptions(String[] args) {
final Options options = getOptions();
-CommandLineParser parser = new DefaultParser(false, false);
+CommandLineParser parser = DefaultParser.builder
