[phoenix] branch master updated: PHOENIX-6323 isRawFilterSupported() returns true for HBase 2.2 compat 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
The following commit(s) were added to refs/heads/master by this push:
new e74857b PHOENIX-6323 isRawFilterSupported() returns true for HBase
2.2 compat module
e74857b is described below
commit e74857b708a6395a83910eac00e15e7c0a55f720
Author: Istvan Toth
AuthorDate: Mon Jan 18 07:49:47 2021 +0100
PHOENIX-6323 isRawFilterSupported() returns true for HBase 2.2 compat module
---
phoenix-core/pom.xml | 4 ++--
.../org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java | 2 --
.../pom.xml | 8
.../org/apache/phoenix/compat/hbase/CompatDelegateHTable.java | 0
.../apache/phoenix/compat/hbase/CompatOmidTransactionTable.java | 0
.../org/apache/phoenix/compat/hbase/CompatPermissionUtil.java | 0
.../apache/phoenix/compat/hbase/CompatPhoenixRpcScheduler.java| 0
.../apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java| 0
.../org/apache/phoenix/compat/hbase/CompatStoreFileReader.java| 0
.../src/main/java/org/apache/phoenix/compat/hbase/CompatUtil.java | 0
.../org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java | 2 --
.../src/main/java/org/apache/phoenix/compat/hbase/OffsetCell.java | 0
.../compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java | 0
.../compat/hbase/coprocessor/CompatIndexRegionObserver.java | 0
.../java/org/apache/phoenix/compat/hbase/test/DelegateCell.java | 0
pom.xml | 8
16 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 9fbbc8f..33a8013 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -64,9 +64,9 @@
("${hbase.compat.version}".equals("2.1.6")
hbaseMinor == 1
hbasePatch =6)
-|| ("${hbase.compat.version}".equals("2.2.1")
+|| ("${hbase.compat.version}".equals("2.2.5")
hbaseMinor == 2
- hbasePatch =1)
+ hbasePatch =5)
|| ("${hbase.compat.version}".equals("2.3.0")
hbaseMinor == 3
hbasePatch =0)
diff --git
a/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
b/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
index 6ec95d6..6931eb4 100644
---
a/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
+++
b/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
@@ -18,8 +18,6 @@
package org.apache.phoenix.compat.hbase;
-import org.apache.hadoop.conf.Configuration;
-
public class HbaseCompatCapabilities {
public static boolean isMaxLookbackTimeSupported() {
diff --git a/phoenix-hbase-compat-2.2.1/pom.xml
b/phoenix-hbase-compat-2.2.5/pom.xml
similarity index 93%
rename from phoenix-hbase-compat-2.2.1/pom.xml
rename to phoenix-hbase-compat-2.2.5/pom.xml
index b5bb8b6..7d07b14 100644
--- a/phoenix-hbase-compat-2.2.1/pom.xml
+++ b/phoenix-hbase-compat-2.2.5/pom.xml
@@ -26,12 +26,12 @@
5.1.0-SNAPSHOT
- phoenix-hbase-compat-2.2.1
- Phoenix Hbase 2.2.1 compatibility
- Compatibility module for HBase 2.2.1+
+ phoenix-hbase-compat-2.2.5
+ Phoenix Hbase 2.2.5 compatibility
+ Compatibility module for HBase 2.2.5+
-2.2.1
+2.2.5
diff --git
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
similarity index 100%
rename from
phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
rename to
phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
diff --git
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
similarity index 100%
rename from
phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
rename to
phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
diff --git
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatPermissionUtil.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatP
[phoenix] branch 4.x updated: PHOENIX-6327 Consolidate Junit test categories (addendum: restore -Xmx3000 option for ParallelStatsDisabledTest)
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 14e69c3 PHOENIX-6327 Consolidate Junit test categories (addendum:
restore -Xmx3000 option for ParallelStatsDisabledTest)
14e69c3 is described below
commit 14e69c363a596101eda8c4e818edf6f746a3e6ed
Author: Istvan Toth
AuthorDate: Wed Jan 20 07:08:40 2021 +0100
PHOENIX-6327 Consolidate Junit test categories (addendum: restore -Xmx3000
option for ParallelStatsDisabledTest)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8916df1..3deb853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,7 +327,7 @@
ParallelStatsDisabledTest
true
-@{jacocoArgLine} -Xmx2000m -XX:MaxPermSize=256m
-Djava.security.egd=file:/dev/./urandom
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/
+@{jacocoArgLine} -Xmx3000m -XX:MaxPermSize=256m
-Djava.security.egd=file:/dev/./urandom
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/
org.apache.phoenix.end2end.ParallelStatsDisabledTest
[phoenix] branch master updated: PHOENIX-6327 Consolidate Junit test categories (addendum: restore -Xmx3000 option for ParallelStatsDisabledTest)
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 772ff2c PHOENIX-6327 Consolidate Junit test categories (addendum:
restore -Xmx3000 option for ParallelStatsDisabledTest)
772ff2c is described below
commit 772ff2c17d3106e5216bc7ceef417e15d34db295
Author: Istvan Toth
AuthorDate: Wed Jan 20 07:06:20 2021 +0100
PHOENIX-6327 Consolidate Junit test categories (addendum: restore -Xmx3000
option for ParallelStatsDisabledTest)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f01d02f..f450c41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -329,7 +329,7 @@
ParallelStatsDisabledTest
true
-@{jacocoArgLine} -Xmx2000m
-Djava.security.egd=file:/dev/./urandom
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
-XX:CMSInitiatingOccupancyFraction=68 -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=./target/
+@{jacocoArgLine} -Xmx3000m
-Djava.security.egd=file:/dev/./urandom
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/
org.apache.phoenix.end2end.ParallelStatsDisabledTest
[phoenix] branch master updated: PHOENIX-6326 Phoenix doesn't work with Java version 11.0.9.1 , due to Jetty problem
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 ded6d73 PHOENIX-6326 Phoenix doesn't work with Java version 11.0.9.1
, due to Jetty problem
ded6d73 is described below
commit ded6d7397ab305a2dbb2fd22d17417d1e6e93828
Author: Istvan Toth
AuthorDate: Mon Jan 18 20:36:34 2021 +0100
PHOENIX-6326 Phoenix doesn't work with Java version 11.0.9.1 , due to Jetty
problem
bump hadoop.version to 3.1.4 for all HBase profiles
---
pom.xml | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index c844830..f01d02f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
-3.0.3
+3.1.4
2.2.1
1.0.0
@@ -1528,8 +1528,6 @@
2.4
2.4.0
${hbase-2.4.runtime.version}
-
-3.1.2
3.4.1
3.5.7
@@ -1562,8 +1560,6 @@
2.2
2.2.1
${hbase-2.2.runtime.version}
-
-3.1.2
@@ -1579,8 +1575,6 @@
2.3
2.3.0
${hbase-2.3.runtime.version}
-
-3.1.2
3.3.0
3.5.7
@@ -1598,8 +1592,6 @@
2.4
2.4.0
${hbase-2.4.runtime.version}
-
-3.1.2
3.4.1
3.5.7
[phoenix] branch 4.x updated: PHOENIX-6327 Consolidate Junit test categories
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 4b4a366 PHOENIX-6327 Consolidate Junit test categories
4b4a366 is described below
commit 4b4a366709a3ffda337c08d88ca51f9c3a36ea25
Author: Istvan Toth
AuthorDate: Tue Jan 19 08:28:47 2021 +0100
PHOENIX-6327 Consolidate Junit test categories
---
.../phoenix/end2end/BaseHBaseManagedTimeIT.java| 69 --
.../phoenix/end2end/HBaseManagedTimeTest.java | 43 --
.../phoenix/end2end/NeedsOwnMiniClusterTest.java | 8 +--
.../phoenix/end2end/ParallelStatsDisabledTest.java | 4 +-
.../phoenix/end2end/ParallelStatsEnabledTest.java | 4 +-
.../phoenix/end2end/SplitSystemCatalogIT.java | 2 +-
.../phoenix/end2end/SplitSystemCatalogTests.java | 28 -
.../java/org/apache/phoenix/query/BaseTest.java| 17 --
.../org/apache/phoenix/pherf/ResultBaseTestIT.java | 26 +++-
.../org/apache/phoenix/pherf/SchemaReaderIT.java | 32 +-
pom.xml| 40 +
11 files changed, 74 insertions(+), 199 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
deleted file mode 100644
index 0f455fd..000
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
+++ /dev/null
@@ -1,69 +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.
- */
-package org.apache.phoenix.end2end;
-
-import javax.annotation.concurrent.NotThreadSafe;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.phoenix.query.BaseTest;
-import org.apache.phoenix.util.ReadOnlyProps;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-/**
- * Base class for tests that let HBase set timestamps.
- * We need to separate these from tests that rely on clients
- * to set timestamps, because we create/destroy the Phoenix tables
- * between tests and only allow a table time stamp to increase.
- * Without this separation table deletion/creation would fail.
- *
- * Try and use (@link BaseHBaseManagedTimeTableReuseIT) and only
- * extend this class if really necessary. It is very slow as
- * we have to delete tables which takes up to 10 seconds per test case.
- * All tests extending this class use the mini cluster that is
- * different from the mini cluster used by test classes extending
- * {@link BaseClientManagedTimeIT}.
- *
- * @since 0.1
- */
-@NotThreadSafe
-@Category(HBaseManagedTimeTest.class)
-public abstract class BaseHBaseManagedTimeIT extends BaseTest {
-protected static Configuration getTestClusterConfig() {
-// don't want callers to modify config.
-return new Configuration(config);
-}
-
-@BeforeClass
-public static synchronized void doSetup() throws Exception {
-setUpTestDriver(ReadOnlyProps.EMPTY_PROPS);
-}
-
-@AfterClass
-public static synchronized void doTeardown() throws Exception {
-dropNonSystemTables();
-}
-
-@After
-public void cleanUpAfterTest() throws Exception {
-deletePriorMetaData(HConstants.LATEST_TIMESTAMP, getUrl());
-}
-}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTest.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTest.java
deleted file mode 100644
index c9eee86..000
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTest.java
+++ /dev/null
@@ -1,43 +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 maynot use
[phoenix] branch master updated: PHOENIX-6327 Consolidate Junit test categories
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 0a1ce60 PHOENIX-6327 Consolidate Junit test categories
0a1ce60 is described below
commit 0a1ce6044a2d3f501071bbbfceb1571c8ed26619
Author: Istvan Toth
AuthorDate: Tue Jan 19 08:28:47 2021 +0100
PHOENIX-6327 Consolidate Junit test categories
---
.../phoenix/end2end/BaseHBaseManagedTimeIT.java| 69 --
.../phoenix/end2end/HBaseManagedTimeTest.java | 43 --
.../phoenix/end2end/NeedsOwnMiniClusterTest.java | 12 ++--
.../phoenix/end2end/ParallelStatsDisabledTest.java | 4 +-
.../phoenix/end2end/ParallelStatsEnabledTest.java | 4 +-
.../phoenix/end2end/SplitSystemCatalogIT.java | 2 +-
.../phoenix/end2end/SplitSystemCatalogTests.java | 28 -
.../java/org/apache/phoenix/query/BaseTest.java| 17 --
.../org/apache/phoenix/pherf/ResultBaseTestIT.java | 26 +++-
.../org/apache/phoenix/pherf/SchemaReaderIT.java | 32 +-
pom.xml| 42 +
11 files changed, 77 insertions(+), 202 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
deleted file mode 100644
index 0f455fd..000
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
+++ /dev/null
@@ -1,69 +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.
- */
-package org.apache.phoenix.end2end;
-
-import javax.annotation.concurrent.NotThreadSafe;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.phoenix.query.BaseTest;
-import org.apache.phoenix.util.ReadOnlyProps;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-
-/**
- * Base class for tests that let HBase set timestamps.
- * We need to separate these from tests that rely on clients
- * to set timestamps, because we create/destroy the Phoenix tables
- * between tests and only allow a table time stamp to increase.
- * Without this separation table deletion/creation would fail.
- *
- * Try and use (@link BaseHBaseManagedTimeTableReuseIT) and only
- * extend this class if really necessary. It is very slow as
- * we have to delete tables which takes up to 10 seconds per test case.
- * All tests extending this class use the mini cluster that is
- * different from the mini cluster used by test classes extending
- * {@link BaseClientManagedTimeIT}.
- *
- * @since 0.1
- */
-@NotThreadSafe
-@Category(HBaseManagedTimeTest.class)
-public abstract class BaseHBaseManagedTimeIT extends BaseTest {
-protected static Configuration getTestClusterConfig() {
-// don't want callers to modify config.
-return new Configuration(config);
-}
-
-@BeforeClass
-public static synchronized void doSetup() throws Exception {
-setUpTestDriver(ReadOnlyProps.EMPTY_PROPS);
-}
-
-@AfterClass
-public static synchronized void doTeardown() throws Exception {
-dropNonSystemTables();
-}
-
-@After
-public void cleanUpAfterTest() throws Exception {
-deletePriorMetaData(HConstants.LATEST_TIMESTAMP, getUrl());
-}
-}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTest.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTest.java
deleted file mode 100644
index c9eee86..000
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HBaseManagedTimeTest.java
+++ /dev/null
@@ -1,43 +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"); y
[phoenix] branch 4.x updated: PHOENIX-6307 Build and release official binary distributions with each HBase profile (addendum: include hbase-compat in phoenix-server)
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 6fe6052 PHOENIX-6307 Build and release official binary distributions
with each HBase profile (addendum: include hbase-compat in phoenix-server)
6fe6052 is described below
commit 6fe6052babdd843184a33b2aefbec154cab1f4b3
Author: Istvan Toth
AuthorDate: Mon Jan 18 05:47:12 2021 +0100
PHOENIX-6307 Build and release official binary distributions with each
HBase profile (addendum: include hbase-compat in phoenix-server)
---
phoenix-server/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 01da9af..69e593f 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -98,6 +98,7 @@
org.apache.phoenix:phoenix-core
+
org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version}
org.iq80.snappy:snappy
org.antlr:antlr*
org.apache.tephra:tephra*
[phoenix] branch master updated: PHOENIX-6307 Build and release official binary distributions with each HBase profile (addendum: remove hbase-compat exclusion from phoenix-server)
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 50df995 PHOENIX-6307 Build and release official binary distributions with each HBase profile (addendum: remove hbase-compat exclusion from phoenix-server) 50df995 is described below commit 50df9957a62b49172859dd1013d4e9e9344f4b52 Author: Istvan Toth AuthorDate: Mon Jan 18 05:29:44 2021 +0100 PHOENIX-6307 Build and release official binary distributions with each HBase profile (addendum: remove hbase-compat exclusion from phoenix-server) --- phoenix-server/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 8e108ba..18f406a 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -120,7 +120,6 @@ log4j:log4j org.slf4j:slf4j-api org.slf4j:slf4j-log4j12 - org.apache.phoenix:phoenix-hbase-compat*
[phoenix] branch master updated: PHOENIX-6316 : git_jira_fix_version_check.py should identify fixed Jira without any commit
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 4b444cd PHOENIX-6316 : git_jira_fix_version_check.py should identify
fixed Jira without any commit
4b444cd is described below
commit 4b444cde9091c15b6a8af367dc05b807c6774860
Author: Viraj Jasani
AuthorDate: Fri Jan 15 17:37:44 2021 +0530
PHOENIX-6316 : git_jira_fix_version_check.py should identify fixed Jira
without any commit
---
dev/misc_utils/README.md | 10 ++
dev/misc_utils/git_jira_fix_version_check.py | 20 ++--
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/dev/misc_utils/README.md b/dev/misc_utils/README.md
index 5e85b21..f6946e0 100644
--- a/dev/misc_utils/README.md
+++ b/dev/misc_utils/README.md
@@ -28,6 +28,9 @@ messages with any of these issues:
3. Jira does not have expected fixVersion
4. Jira has expected fixVersion, but it is not yet resolved
+Moreover, this script also finds any resolved Jira with expected
+fixVersion but without any corresponding commit present.
+
This should be useful as part of RC preparation.
git_jira_fix_version_check supports python3 and it required
@@ -102,6 +105,13 @@ Found first commit hash after which git history is
redundant. commit: 02d5935cbb
Exiting successfully
Jira/Git commit message diff completed:
##
+Any resolved Jira with fixVersion 4.16.0 but corresponding commit not present
+Starting diff: ##
+PHOENIX-6259 is marked resolved with fixVersion 4.16.0 but no corresponding
commit found
+PHOENIX-6258 is marked resolved with fixVersion 4.16.0 but no corresponding
commit found
+PHOENIX-6255 is marked resolved with fixVersion 4.16.0 but no corresponding
commit found
+Completed diff: ##
+
```
diff --git a/dev/misc_utils/git_jira_fix_version_check.py
b/dev/misc_utils/git_jira_fix_version_check.py
index 0d1266f..65eaf6c 100644
--- a/dev/misc_utils/git_jira_fix_version_check.py
+++ b/dev/misc_utils/git_jira_fix_version_check.py
@@ -49,6 +49,8 @@ print(git_status_msg)
print('\nJira/Git commit message diff starting:
##')
+issue_set_from_commit_msg = set()
+
for commit in subprocess.check_output(['git', 'log',
'--pretty=oneline']).decode(
"utf-8").splitlines():
if commit.startswith(first_exclude_commit_hash):
@@ -77,12 +79,26 @@ for commit in subprocess.check_output(['git', 'log',
'--pretty=oneline']).decode
if not expected_fix_version:
print("Jira not present with version: " + fix_version + ". \t Commit:
" + commit)
continue
-if issue.fields.resolution is None or issue.fields.resolution.name !=
'Fixed':
+if issue.fields.status is None or issue.fields.status.name not in
('Resolved', 'Closed'):
print("Jira is not resolved yet? \t\t Commit: " + commit)
else:
# This means Jira corresponding to current commit message is resolved
with expected
# fixVersion.
# This is no-op by default, if needed, convert to print statement.
-pass
+issue_set_from_commit_msg.add(project_jira_key + jira_num)
print('Jira/Git commit message diff completed:
##')
+
+print('\nAny resolved Jira with fixVersion ' + fix_version
+ + ' but corresponding commit not present')
+print('Starting diff: ##')
+all_issues_with_fix_version = jira.search_issues(
+'project=' + jira_project_name + ' and status in (Resolved,Closed) and
fixVersion='
++ fix_version)
+
+for issue in all_issues_with_fix_version:
+if issue.key not in issue_set_from_commit_msg:
+print(issue.key + ' is marked resolved with fixVersion ' + fix_version
++ ' but no corresponding commit found')
+
+print('Completed diff: ##')
[phoenix-omid] branch master updated: OMID-173 Upgrade netty version to latest 3.x
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 34f0e26 OMID-173 Upgrade netty version to latest 3.x
34f0e26 is described below
commit 34f0e264322a135dd03813cc890c301da40a8449
Author: Richard Antal
AuthorDate: Fri Jan 15 11:04:59 2021 +0100
OMID-173 Upgrade netty version to latest 3.x
Change-Id: I3fbecd481df0d9994ca41791761daf29573711f7
---
pom.xml| 2 +-
transaction-client/pom.xml | 2 +-
tso-server/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2b3797a..adcedb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,7 @@
6.10
1.7.7
1.2.17
-3.2.6.Final
+3.10.6.Final
2.5.0
0.6.1
1.6.2
diff --git a/transaction-client/pom.xml b/transaction-client/pom.xml
index ffd57b5..ef79107 100644
--- a/transaction-client/pom.xml
+++ b/transaction-client/pom.xml
@@ -68,7 +68,7 @@
${curator.version}
-org.jboss.netty
+io.netty
netty
${netty.version}
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index c34a47e..0ce2eb8 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -110,7 +110,7 @@
-org.jboss.netty
+io.netty
netty
${netty.version}
[phoenix] branch master updated: PHOENIX-6314 : Utility to identify git commit / Jira fixVersion discrepancies for RC preparation
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 196c1a3 PHOENIX-6314 : Utility to identify git commit / Jira
fixVersion discrepancies for RC preparation
196c1a3 is described below
commit 196c1a36f6826e1d557be7cecc46f1599c428dde
Author: Viraj Jasani
AuthorDate: Thu Jan 14 15:54:57 2021 +0530
PHOENIX-6314 : Utility to identify git commit / Jira fixVersion
discrepancies for RC preparation
---
dev/misc_utils/README.md | 108 +++
dev/misc_utils/git_jira_fix_version_check.py | 88 ++
2 files changed, 196 insertions(+)
diff --git a/dev/misc_utils/README.md b/dev/misc_utils/README.md
new file mode 100644
index 000..5e85b21
--- /dev/null
+++ b/dev/misc_utils/README.md
@@ -0,0 +1,108 @@
+
+
+
+
+
+dev/misc_utils are supposed to contain multiple utility files.
+
+As of this writing, we have git_jira_fix_version_check.py script
+that takes care of identifying all git commits with commit
+messages with any of these issues:
+1. commit is reverted as per commit message
+2. commit does not contain Jira number format PHOENIX- in message
+3. Jira does not have expected fixVersion
+4. Jira has expected fixVersion, but it is not yet resolved
+
+This should be useful as part of RC preparation.
+
+git_jira_fix_version_check supports python3 and it required
+installation of jira:
+```
+pip3 install jira
+```
+The script also requires below inputs:
+```
+1. First commit hash to start excluding commits from history:
+ Usually we can provide latest commit hash from last tagged release
+ so that the script will only loop through all commits in git commit
+ history before this commit hash. e.g for 4.16 release, we can provide
+ git hash: a2adf5e572c5a4bcccee7f8ac43bad6b84293ec6
+ because this was the last commit hash in last
+ 4.15 release tag:
https://github.com/apache/phoenix/releases/tag/v4.15.0-HBase-1.5
+ For 5.1.0, git hash: 8a819c6c3b4befce190c6ac759f744df511de61d
+ as it was the last commit hash in 5.0 release tag:
+ https://github.com/apache/phoenix/releases/tag/v5.0.0-HBase-2.0
+
+2. Fix Version:
+ Exact fixVersion that we would like to compare all Jira's fixVersions
+ with. e.g for 4.16 first release, it should be 4.16.0
+ for first release of 5.1, it should be 5.1.0
+
+3. JIRA Project Name:
+ The exact name of Project as case-sensitive e.g PHOENIX / OMID / TEPHRA
+
+4. Path of project's working dir with release branch checked-in:
+ Path of project from where we want to compare git hashes from. Local fork
+ of the project should be up-to date with upstream and expected release
+ branch should be checked-in.
+
+5. Jira server url (default url: https://issues.apache.org/jira):
+ Default value of server points to ASF Jiras but this script can be
+ used outside of ASF Jira too.
+```
+
+
+Example of script execution:
+```
+$ python3 dev/misc_utils/git_jira_fix_version_check.py
+JIRA Project Name (e.g PHOENIX / OMID / TEPHRA etc): PHOENIX
+First commit hash to start excluding commits from history:
a2adf5e572c5a4bcccee7f8ac43bad6b84293ec6
+Fix Version: 4.16.0
+Jira server url (default: https://issues.apache.org/jira):
+Path of project's working dir with release branch checked-in:
/Users/{USER}/Documents/phoenix
+
+Check git status output and verify expected branch
+
+On branch 4.16
+Your branch is up to date with 'origin/4.16'.
+
+nothing to commit, working tree clean
+
+
+Jira/Git commit message diff starting:
##
+Jira not present with version: 4.16.0. Commit:
96f7a28aacff1828c425fe50f7fef43641910e1f PHOENIX-6120 Addendum for license
header
+Jira not present with version: 4.16.0. Commit:
67268793412789e3806664f90845e074b1f21a36 PHOENIX-6219 GlobalIndexChecker
doesn't work for SingleCell indexes
+Jira not present with version: 4.16.0. Commit:
ad70231581506dc954f6d27df43778343de8fbc0 PHOENIX-6120 Change IndexMaintainer
for SINGLE_CELL_ARRAY_WITH_OFFSETS indexes
+Jira not present with version: 4.16.0. Commit:
182a6015ee5aa17110a17f862cf98f0934d1aca1 PHOENIX-6220 CREATE INDEX shouldn't
ignore IMMUTABLE_STORAGE_SCHEME and COLUMN_ENDCODED_BYTES
+Jira not present with version: 4.16.0. Commit:
8a764813e4e4c9aa421923dc530a52d1bf8b4301 PHOENIX-6276: Log when hconnection is
getting closed in ConnectionQueryServicesImpl
+Jira is not resolved yet? Commit:
237b7248dafe51087a8a95aa5bc67e5ce141e89d PHOENIX-6288 Minicluster startup
problems on Jenkins
+Jira not present with version: 4.16.0. Commit:
3b6ea0240de9d4a0ad4747c3cd43cac5c949cc23 Merge PHOENIX-6182: IndexTool to
verify and repair every index row (#1022)
+Commit seems reverted
[phoenix] branch 4.x updated: PHOENIX-6307 Build and release official binary distributions with each HBase profile
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 df6a5e4 PHOENIX-6307 Build and release official binary distributions with each HBase profile df6a5e4 is described below commit df6a5e4345eee66030b571c9377d221333549100 Author: Istvan Toth AuthorDate: Wed Jan 13 08:14:34 2021 +0100 PHOENIX-6307 Build and release official binary distributions with each HBase profile also change default HBase profile to 1.6 --- BUILDING.md| 4 +- bin/phoenix_utils.py | 24 +--- phoenix-assembly/pom.xml | 26 ++--- .../build/components/all-common-dependencies.xml | 9 -- .../src/build/components/all-common-jars.xml | 122 + .../phoenix-client-embedded/pom.xml| 8 +- phoenix-client-parent/phoenix-client/pom.xml | 8 +- phoenix-server/pom.xml | 8 +- pom.xml| 64 --- 9 files changed, 77 insertions(+), 196 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 97ee769..e37086a 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -50,7 +50,7 @@ As Phoenix uses *limited public* HBase APIs, which sometimes change even within Phoenix may not build or work with older releases of HBase, or ones that were released after Phoenix, even within the same HBase minor release. -By default, Phoenix will be built for the latest known patch level of the earliest HBase 1.x +By default, Phoenix will be built for the latest known patch level of the latest HBase 1.x minor release that Phoenix supports. You can specify the targeted HBase minor release by setting the `hbase.profile` system property for @@ -59,7 +59,7 @@ maven. You can also specify the exact HBase release to build Phoenix with by additionally setting the `hbase.version` system property. - * `mvn clean install` will use the latest known patch release of the the earliest supported HBase 1 minor relese + * `mvn clean install` will use the latest known patch release of the the latest supported HBase 1 minor relese * `mvn clean install -Dhbase.profile=1.4` will use the latest known patch release of HBase 1.4 * `mvn clean install -Dhbase.profile=1.4 -Dhbase.version=1.4.3` will build with HBase 1.4.3 diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py index cf675d0..84f228d 100755 --- a/bin/phoenix_utils.py +++ b/bin/phoenix_utils.py @@ -77,10 +77,7 @@ def findClasspath(command_name): return tryDecode(subprocess.Popen(command, shell=True, stdout=subprocess.PIPE).stdout.read()) def setPath(): -PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client*[!s].jar" -PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar" -PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-*-queryserver.jar" -PHOENIX_LOADBALANCER_JAR_PATTERN = "phoenix-load-balancer-*[!t][!e][!s][!t][!s].jar" +PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client-hbase-*[!s].jar" PHOENIX_TRACESERVER_JAR_PATTERN = "phoenix-tracing-webapp-*-runnable.jar" PHOENIX_TESTS_JAR_PATTERN = "phoenix-core-*-tests*.jar" PHOENIX_PHERF_JAR_PATTERN = "phoenix-pherf-*-minimal*.jar" @@ -165,20 +162,6 @@ def setPath(): if testjar == "": testjar = find(PHOENIX_TESTS_JAR_PATTERN, phoenix_class_path) -global phoenix_queryserver_jar -phoenix_queryserver_jar = find(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-queryserver", "target", "*")) -if phoenix_queryserver_jar == "": -phoenix_queryserver_jar = findFileInPathWithoutRecursion(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, "..", "lib")) -if phoenix_queryserver_jar == "": -phoenix_queryserver_jar = findFileInPathWithoutRecursion(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, "..")) - -global phoenix_loadbalancer_jar -phoenix_loadbalancer_jar = find(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-loadbalancer", "target", "*")) -if phoenix_loadbalancer_jar == "": -phoenix_loadbalancer_jar = findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, "..", "lib")) -if phoenix_loadbalancer_jar == "": -phoenix_loadbalancer_jar = findFileInPathWithoutRecursion(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, "..")) - global phoenix_traceserver_jar phoenix_traceserver_jar = find(PHOENIX_TRACESERVER_JAR_PATTERN, os.path.join(
[phoenix] branch master updated: PHOENIX-6307 Build and release official binary distributions with each HBase profile
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 c2fbab1 PHOENIX-6307 Build and release official binary distributions with each HBase profile c2fbab1 is described below commit c2fbab1715dc41c78debb175ce9ecd2089ca0ff5 Author: Istvan Toth AuthorDate: Mon Jan 11 09:33:40 2021 +0100 PHOENIX-6307 Build and release official binary distributions with each HBase profile --- BUILDING.md| 4 +- bin/phoenix_utils.py | 24 + .../cache-apache-project-artifact.sh | 1 + dev/create-release/do-release-docker.sh| 1 - dev/create-release/rebuild_hbase.sh| 1 + dev/create-release/release-build.sh| 8 +- dev/create-release/release-util.sh | 115 ++--- dev/rebuild_hbase.sh | 6 +- phoenix-assembly/pom.xml | 26 ++--- .../build/components/all-common-dependencies.xml | 9 -- .../src/build/components/all-common-jars.xml | 4 +- .../phoenix-client-embedded/pom.xml| 7 +- phoenix-client-parent/phoenix-client/pom.xml | 7 +- phoenix-core/pom.xml | 15 +++ phoenix-server/pom.xml | 22 +++- pom.xml| 69 ++--- 16 files changed, 192 insertions(+), 127 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 9433aed..707b467 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -71,7 +71,7 @@ As Phoenix uses *limited public* HBase APIs, which sometimes change even within Phoenix may not build or work with older releases of HBase, or ones that were released after Phoenix, even within the same HBase minor release. -By default, Phoenix will be built for the latest known patch level of the earliest HBase 2.x +By default, Phoenix will be built for the latest known patch level of the latest HBase 2.x minor release that Phoenix supports. You can specify the targeted HBase minor release by setting the `hbase.profile` system property for @@ -80,7 +80,7 @@ maven. You can also specify the exact HBase release to build Phoenix with by additionally setting the `hbase.version` system property. - * `mvn clean install` will use the latest known patch release of the the earliest supported HBase 2 minor relese + * `mvn clean install` will use the latest known patch release of the the latest supported HBase 2 minor relese * `mvn clean install -Dhbase.profile=2.1` will use the latest known patch release of HBase 2.1 * `mvn clean install -Dhbase.profile=2.1 -Dhbase.version=2.1.7` will build with HBase 2.1.7 diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py index cf675d0..84f228d 100755 --- a/bin/phoenix_utils.py +++ b/bin/phoenix_utils.py @@ -77,10 +77,7 @@ def findClasspath(command_name): return tryDecode(subprocess.Popen(command, shell=True, stdout=subprocess.PIPE).stdout.read()) def setPath(): -PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client*[!s].jar" -PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar" -PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-*-queryserver.jar" -PHOENIX_LOADBALANCER_JAR_PATTERN = "phoenix-load-balancer-*[!t][!e][!s][!t][!s].jar" +PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client-hbase-*[!s].jar" PHOENIX_TRACESERVER_JAR_PATTERN = "phoenix-tracing-webapp-*-runnable.jar" PHOENIX_TESTS_JAR_PATTERN = "phoenix-core-*-tests*.jar" PHOENIX_PHERF_JAR_PATTERN = "phoenix-pherf-*-minimal*.jar" @@ -165,20 +162,6 @@ def setPath(): if testjar == "": testjar = find(PHOENIX_TESTS_JAR_PATTERN, phoenix_class_path) -global phoenix_queryserver_jar -phoenix_queryserver_jar = find(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-queryserver", "target", "*")) -if phoenix_queryserver_jar == "": -phoenix_queryserver_jar = findFileInPathWithoutRecursion(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, "..", "lib")) -if phoenix_queryserver_jar == "": -phoenix_queryserver_jar = findFileInPathWithoutRecursion(PHOENIX_QUERYSERVER_JAR_PATTERN, os.path.join(current_dir, "..")) - -global phoenix_loadbalancer_jar -phoenix_loadbalancer_jar = find(PHOENIX_LOADBALANCER_JAR_PATTERN, os.path.join(current_dir, "..", "phoenix-loadbalancer", "target", "*")) -if phoenix_loadbalancer_jar == "": -phoenix_loadbalancer_jar = findFileInPathWithoutRecursion(PHOENIX_LOAD
[phoenix] branch master updated: PHOENIX-6313 Rebuild HBase in Yetus
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 9d171c0 PHOENIX-6313 Rebuild HBase in Yetus
9d171c0 is described below
commit 9d171c0b6b940bff6632a11811f6a802df1f0f9c
Author: Istvan Toth
AuthorDate: Thu Jan 14 11:29:42 2021 +0100
PHOENIX-6313 Rebuild HBase in Yetus
---
dev/phoenix-personality.sh | 33 -
dev/rebuild_hbase.sh | 40 +++-
2 files changed, 63 insertions(+), 10 deletions(-)
diff --git a/dev/phoenix-personality.sh b/dev/phoenix-personality.sh
index 692981e..618f69b 100755
--- a/dev/phoenix-personality.sh
+++ b/dev/phoenix-personality.sh
@@ -146,7 +146,7 @@ function personality_modules
fi
# If we have HBASE_PROFILE specified pass along
- # the hadoop.profile system property.
+ # the hbase.profile system property.
if [[ -n "${HBASE_PROFILE}" ]] ; then
extra="${extra} -Dhbase.profile=${HBASE_PROFILE}"
fi
@@ -298,6 +298,37 @@ function get_include_exclude_tests_arg
##
+add_test_type hbaserebuild
+
+## @description hbaserebuild file filter
+## @audience private
+## @stabilityevolving
+## @paramfilename
+function hbaserebuild_filefilter
+{
+ local filename=$1
+
+ if [[ ${filename} =~ \.java$ ]]; then
+add_test hbaserebuild
+ fi
+}
+
+## @description hbaserebuild precheck
+## @audience private
+## @stabilityevolving
+## @paramnone
+function hbaserebuild_precompile
+{
+ big_console_header "Reinstalling HBase with Hadoop 3"
+
+ MAVEN_LOCAL_REPO="$MAVEN_LOCAL_REPO" ${BASEDIR}/dev/rebuild_hbase.sh detect
+
+ add_vote_table +0 hbaserecompile "" "HBase recompiled."
+ return 0
+}
+
+##
+
add_test_type hbaseanti
## @description hbaseanti file filter
diff --git a/dev/rebuild_hbase.sh b/dev/rebuild_hbase.sh
index e4c9211..2e7bc40 100755
--- a/dev/rebuild_hbase.sh
+++ b/dev/rebuild_hbase.sh
@@ -14,10 +14,34 @@
# Rebuilds HBase with -Dhadoop.profile=3.0 locally, to work around PHOENIX-5993
# Intended mainly for CI jobs, but can simplify manual rebuilds as well.
+
+DEV_SUPPORT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+ARTIFACTS_DIR="$DEV_SUPPORT/artifacts"
+WORK_DIR="$DEV_SUPPORT/work"
+
+if [[ ! -z "$MAVEN_SETTINGS_FILE" ]]; then
+ SETTINGS=( "--settings" "$MAVEN_SETTINGS_FILE" )
+fi
+
+if [[ ! -z "$MAVEN_LOCAL_REPO" ]]; then
+ LOCALREPO="-Dmaven.repo.local=${MAVEN_LOCAL_REPO}"
+fi
+
+if [[ "$1" == "detect" ]]; then
+ set -e
+ cd "$DEV_SUPPORT/.."
+ HBASE_VERSION=$(mvn ${SETTINGS[@]} help:evaluate -Dexpression=hbase.version
-q -DforceStdout $LOCALREPO)
+ echo "HBASE_VERSION=$HBASE_VERSION"
+ cd "$DEV_SUPPORT"
+ set +e
+else
+ HBASE_VERSION="$1"
+fi
+
# The name of the Apache Hbase source file
-HBASE_SOURCE_NAME="hbase-$1-src.tar.gz"
+HBASE_SOURCE_NAME="hbase-$HBASE_VERSION-src.tar.gz"
# The relative path on the ASF mirrors for the Hbase source file
-HBASE_SOURCE_MIRROR_NAME="hbase/$1/$HBASE_SOURCE_NAME"
+HBASE_SOURCE_MIRROR_NAME="hbase/$HBASE_VERSION/$HBASE_SOURCE_NAME"
# Downloads the specified HBase version source, extracts it,
# then rebuilds and installs the maven artifacts locally with
-Dhadoop.profile=3.0
@@ -27,10 +51,6 @@ if [ $# -ne 1 ]
echo "Supply the Hbase version as paramater i.e.: rebuild_hbase.sh 2.2.6 "
fi
-DEV_SUPPORT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-ARTIFACTS_DIR="$DEV_SUPPORT/artifacts"
-WORK_DIR="$DEV_SUPPORT/work"
-
mkdir "$ARTIFACTS_DIR"
mkdir "$WORK_DIR"
@@ -39,7 +59,9 @@ $DEV_SUPPORT/cache-apache-project-artifact.sh --keys
https://downloads.apache.or
STARTDIR=$PWD
cd $ARTIFACTS_DIR
-tar xfz hbase-$1-src.tar.gz
-cd hbase-$1
-mvn clean install -Dhadoop.profile=3.0 -DskipTests -B
+tar xfz hbase-$HBASE_VERSION-src.tar.gz
+cd hbase-$HBASE_VERSION
+echo mvn ${SETTINGS[@]} clean install -Dhadoop.profile=3.0 -DskipTests -B
$LOCALREPO
+mvn ${SETTINGS[@]} clean install -Dhadoop.profile=3.0 -DskipTests -B $LOCALREPO
cd ${STARTDIR}
+
[phoenix] branch master updated: PHOENIX-3710 Cannot use lowername data table name with indextool
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 2817dee PHOENIX-3710 Cannot use lowername data table name with
indextool
2817dee is described below
commit 2817dee00ebb282a8d6985dd742b8f335718c6a9
Author: Istvan Toth
AuthorDate: Wed Jan 6 13:24:19 2021 +0100
PHOENIX-3710 Cannot use lowername data table name with indextool
Co-authored-by: Ankit Singhal
Co-authored-by: Josh Elser
---
.../org/apache/phoenix/end2end/IndexToolIT.java| 145 +++--
.../apache/phoenix/mapreduce/index/IndexTool.java | 58 +
.../phoenix/mapreduce/index/IndexToolUtil.java | 2 +-
.../index/PhoenixIndexImportDirectReducer.java | 2 +-
.../java/org/apache/phoenix/util/SchemaUtil.java | 27 +++-
5 files changed, 190 insertions(+), 44 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index 8a1baea..bfee87f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -51,11 +51,13 @@ import
org.apache.phoenix.mapreduce.index.PhoenixServerBuildIndexMapper;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.schema.PIndexState;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.transaction.PhoenixTransactionProvider.Feature;
import org.apache.phoenix.transaction.TransactionFactory;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
@@ -64,6 +66,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -97,6 +101,8 @@ import static org.junit.Assert.fail;
@RunWith(Parameterized.class)
public class IndexToolIT extends BaseUniqueNamesOwnClusterIT {
+private static final Logger LOGGER =
LoggerFactory.getLogger(IndexToolIT.class);
+
private final boolean localIndex;
private final boolean mutable;
private final boolean transactional;
@@ -647,13 +653,129 @@ public class IndexToolIT extends
BaseUniqueNamesOwnClusterIT {
}
}
+@Test
+public void testCaseSensitiveNames() throws Exception {
+// We have three references to the "same" table name. e.g. for
`my_table`
+// The original name, unquoted: `my_table`
+// The quoted name to prevent Phoenix from auto-capitalizing it (s):
`"my_table"`
+// The qualified named with schema (q): `"my_schema":"my_table"`
+String schemaName = generateUniqueName().toLowerCase();
+String dataTableName = generateUniqueName().toLowerCase();
+String sSchemaName =
SchemaUtil.getCaseSensitiveColumnDisplayName(null, schemaName);
+String sDataTableName =
SchemaUtil.getCaseSensitiveColumnDisplayName(null, dataTableName);
+String qDataTableName =
SchemaUtil.getCaseSensitiveColumnDisplayName(schemaName, dataTableName);
+// The explain plan doesn't re-quote the qualified table name:
`my_schema.my_table`
+String dataTableNameForExplain = SchemaUtil.getTableName(schemaName,
dataTableName);
+
+String indexTableName = generateUniqueName().toLowerCase();
+String sIndexTableName =
SchemaUtil.getCaseSensitiveColumnDisplayName(null, indexTableName);
+String indexTableNameForExplain = SchemaUtil.getTableName(schemaName,
indexTableName);
+
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+try {
+String stmString1 =
+"CREATE TABLE " + qDataTableName
+ + " (ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR,
ZIP INTEGER) "
+ + tableDDLOptions;
+conn.createStatement().execute(stmString1);
+String upsertQuery = String.format("UPSERT INTO %s VALUES(?, ?,
?)", qDataTableName);
+PreparedStatement stmt1 = conn.prepareStatement(upsertQuery);
+
+// insert two rows
+upsertRow(stmt1, 1);
+upsertRow(stmt1, 2);
+conn.commit();
+
+if (transactional) {
+
[phoenix] branch 4.x updated: PHOENIX-3710 Cannot use lowername data table name with indextool
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 b4bb3a2 PHOENIX-3710 Cannot use lowername data table name with
indextool
b4bb3a2 is described below
commit b4bb3a2d96cbbea784a20825890ce8f6cebab43c
Author: Istvan Toth
AuthorDate: Wed Jan 6 13:24:19 2021 +0100
PHOENIX-3710 Cannot use lowername data table name with indextool
Co-authored-by: Ankit Singhal
Co-authored-by: Josh Elser
---
.../org/apache/phoenix/end2end/IndexToolIT.java| 144 +++--
.../apache/phoenix/mapreduce/index/IndexTool.java | 64 -
.../phoenix/mapreduce/index/IndexToolUtil.java | 2 +-
.../index/PhoenixIndexImportDirectReducer.java | 2 +-
.../java/org/apache/phoenix/util/SchemaUtil.java | 27 +++-
pom.xml| 2 +-
6 files changed, 193 insertions(+), 48 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index 8fb5ea7..8ea82a9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -54,11 +54,13 @@ import
org.apache.phoenix.mapreduce.index.PhoenixServerBuildIndexMapper;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.schema.PIndexState;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.transaction.PhoenixTransactionProvider.Feature;
import org.apache.phoenix.transaction.TransactionFactory;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.TestUtil;
@@ -67,6 +69,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.sql.Connection;
@@ -103,6 +107,8 @@ import static org.junit.Assert.fail;
@RunWith(Parameterized.class)
public class IndexToolIT extends BaseUniqueNamesOwnClusterIT {
+private static final Logger LOGGER =
LoggerFactory.getLogger(IndexToolIT.class);
+
private final boolean localIndex;
private final boolean mutable;
private final boolean transactional;
@@ -650,13 +656,129 @@ public class IndexToolIT extends
BaseUniqueNamesOwnClusterIT {
}
}
+@Test
+public void testCaseSensitiveNames() throws Exception {
+// We have three references to the "same" table name. e.g. for
`my_table`
+// The original name, unquoted: `my_table`
+// The quoted name to prevent Phoenix from auto-capitalizing it (s):
`"my_table"`
+// The qualified named with schema (q): `"my_schema":"my_table"`
+String schemaName = generateUniqueName().toLowerCase();
+String dataTableName = generateUniqueName().toLowerCase();
+String sSchemaName =
SchemaUtil.getCaseSensitiveColumnDisplayName(null, schemaName);
+String sDataTableName =
SchemaUtil.getCaseSensitiveColumnDisplayName(null, dataTableName);
+String qDataTableName =
SchemaUtil.getCaseSensitiveColumnDisplayName(schemaName, dataTableName);
+// The explain plan doesn't re-quote the qualified table name:
`my_schema.my_table`
+String dataTableNameForExplain = SchemaUtil.getTableName(schemaName,
dataTableName);
+
+String indexTableName = generateUniqueName().toLowerCase();
+String sIndexTableName =
SchemaUtil.getCaseSensitiveColumnDisplayName(null, indexTableName);
+String indexTableNameForExplain = SchemaUtil.getTableName(schemaName,
indexTableName);
+
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+try {
+String stmString1 =
+"CREATE TABLE " + qDataTableName
+ + " (ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR,
ZIP INTEGER) "
+ + tableDDLOptions;
+conn.createStatement().execute(stmString1);
+String upsertQuery = String.format("UPSERT INTO %s VALUES(?, ?,
?)", qDataTableName);
+PreparedStatement stmt1 = conn.prepareStatement(upsertQuery);
+
+// insert two rows
+upsertRow(stmt1, 1);
+upsertRow(stmt1, 2);
+conn.commit();
+
+
[phoenix] branch 4.x updated: PHOENIX-6298 : Use timestamp of PENDING_DISABLE_COUNT to calculate elapse time for PENDING_DISABLE state
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 67ffa6a PHOENIX-6298 : Use timestamp of PENDING_DISABLE_COUNT to
calculate elapse time for PENDING_DISABLE state
67ffa6a is described below
commit 67ffa6a347f222cd4f297b3ef36abd691cd2e76f
Author: Viraj Jasani
AuthorDate: Tue Jan 5 16:28:04 2021 +0530
PHOENIX-6298 : Use timestamp of PENDING_DISABLE_COUNT to calculate elapse
time for PENDING_DISABLE state
---
.../end2end/index/PartialIndexRebuilderIT.java | 84 --
.../coprocessor/MetaDataRegionObserver.java| 16 +++--
.../java/org/apache/phoenix/util/IndexUtil.java| 21 ++
3 files changed, 109 insertions(+), 12 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
index d0811ed..bc9bcfe 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
@@ -17,6 +17,7 @@
*/
package org.apache.phoenix.end2end.index;
+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;
@@ -30,6 +31,7 @@ import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Random;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -63,6 +65,7 @@ import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.IndexScrutiny;
import org.apache.phoenix.util.IndexUtil;
import org.apache.phoenix.util.MetaDataUtil;
+import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.Repeat;
import org.apache.phoenix.util.SchemaUtil;
@@ -83,9 +86,7 @@ public class PartialIndexRebuilderIT extends
BaseUniqueNamesOwnClusterIT {
private static final long REBUILD_PERIOD = 5;
private static final long REBUILD_INTERVAL = 2000;
private static RegionCoprocessorEnvironment
indexRebuildTaskRegionEnvironment;
-private static Boolean runRebuildOnce = true;
-
@BeforeClass
public static synchronized void doSetup() throws Exception {
Map serverProps = Maps.newHashMapWithExpectedSize(10);
@@ -128,8 +129,8 @@ public class PartialIndexRebuilderIT extends
BaseUniqueNamesOwnClusterIT {
private static void runIndexRebuilderAsync(final int interval, final
boolean[] cancel, String table) {
runIndexRebuilderAsync(interval, cancel,
Collections.singletonList(table));
}
+
private static void runIndexRebuilderAsync(final int interval, final
boolean[] cancel, final List tables) {
-runRebuildOnce = true;
Thread thread = new Thread(new Runnable() {
@Override
public void run() {
@@ -142,8 +143,6 @@ public class PartialIndexRebuilderIT extends
BaseUniqueNamesOwnClusterIT {
throw new RuntimeException(e);
} catch (SQLException e) {
LOGGER.error(e.getMessage(),e);
-} finally {
-runRebuildOnce = false;
}
}
}
@@ -561,7 +560,13 @@ public class PartialIndexRebuilderIT extends
BaseUniqueNamesOwnClusterIT {
@Override
public long currentTime() {
-return time++;
+synchronized (this) {
+return time++;
+}
+}
+
+private synchronized void addTime(long diff) {
+time += diff;
}
}
@@ -1088,4 +1093,71 @@ public class PartialIndexRebuilderIT extends
BaseUniqueNamesOwnClusterIT {
throw new DoNotRetryIOException("Simulating write failure on " +
c.getEnvironment().getRegionInfo().getTable().getNameAsString());
}
}
+
+@Test
+public void testPendingDisableWithDisableCountTs() throws Throwable {
+final String schemaName = generateUniqueName();
+final String tableName = generateUniqueName();
+final String indexName = generateUniqueName();
+final String fullTableName = SchemaUtil.getTableName(schemaName,
tableName);
+final String fullIndexName = SchemaUtil.getTableName(schemaName,
indexName);
+final MyClock clock =
+new MyClock(EnvironmentEdgeManager.currentTimeMillis());
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+
+try (Connection conn = DriverManager.getConnection(getUr
[phoenix] branch master updated: PHOENIX-6298 : Use timestamp of PENDING_DISABLE_COUNT to calculate elapse time for PENDING_DISABLE state
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 5b4711c PHOENIX-6298 : Use timestamp of PENDING_DISABLE_COUNT to
calculate elapse time for PENDING_DISABLE state
5b4711c is described below
commit 5b4711c032292ea6014e5f3ebe60d826b033877f
Author: Viraj Jasani
AuthorDate: Tue Jan 5 16:28:04 2021 +0530
PHOENIX-6298 : Use timestamp of PENDING_DISABLE_COUNT to calculate elapse
time for PENDING_DISABLE state
---
.../end2end/index/PartialIndexRebuilderIT.java | 87 --
.../coprocessor/MetaDataRegionObserver.java| 16 ++--
.../java/org/apache/phoenix/util/IndexUtil.java| 21 ++
3 files changed, 111 insertions(+), 13 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
index f8833fc..89c6190 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/PartialIndexRebuilderIT.java
@@ -17,6 +17,7 @@
*/
package org.apache.phoenix.end2end.index;
+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;
@@ -30,6 +31,7 @@ import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import java.util.Random;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -64,6 +66,7 @@ import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.IndexScrutiny;
import org.apache.phoenix.util.IndexUtil;
import org.apache.phoenix.util.MetaDataUtil;
+import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.Repeat;
import org.apache.phoenix.util.SchemaUtil;
@@ -84,9 +87,7 @@ public class PartialIndexRebuilderIT extends
BaseUniqueNamesOwnClusterIT {
private static final long REBUILD_PERIOD = 5;
private static final long REBUILD_INTERVAL = 2000;
private static RegionCoprocessorEnvironment
indexRebuildTaskRegionEnvironment;
-private static Boolean runRebuildOnce = true;
-
@BeforeClass
public static synchronized void doSetup() throws Exception {
Map serverProps = Maps.newHashMapWithExpectedSize(10);
@@ -129,8 +130,8 @@ public class PartialIndexRebuilderIT extends
BaseUniqueNamesOwnClusterIT {
private static void runIndexRebuilderAsync(final int interval, final
boolean[] cancel, String table) {
runIndexRebuilderAsync(interval, cancel,
Collections.singletonList(table));
}
+
private static void runIndexRebuilderAsync(final int interval, final
boolean[] cancel, final List tables) {
-runRebuildOnce = true;
Thread thread = new Thread(new Runnable() {
@Override
public void run() {
@@ -143,8 +144,6 @@ public class PartialIndexRebuilderIT extends
BaseUniqueNamesOwnClusterIT {
throw new RuntimeException(e);
} catch (SQLException e) {
LOGGER.error(e.getMessage(),e);
-} finally {
-runRebuildOnce = false;
}
}
}
@@ -563,15 +562,22 @@ public class PartialIndexRebuilderIT extends
BaseUniqueNamesOwnClusterIT {
@Override
public long currentTime() {
-if(shouldAdvance) {
-return time++;
+if (shouldAdvance) {
+synchronized (this) {
+return time++;
+}
} else {
return time;
}
}
+
public void setAdvance(boolean val) {
shouldAdvance = val;
}
+
+private synchronized void addTime(long diff) {
+time += diff;
+}
}
private static void waitForIndexState(Connection conn, String
fullTableName, String fullIndexName, PIndexState expectedIndexState) throws
InterruptedException, SQLException {
@@ -1060,4 +1066,71 @@ public class PartialIndexRebuilderIT extends
BaseUniqueNamesOwnClusterIT {
throw new DoNotRetryIOException("Simulating write failure on " +
c.getEnvironment().getRegionInfo().getTable().getNameAsString());
}
}
+
+@Test
+public void testPendingDisableWithDisableCountTs() throws Throwable {
+final String schemaName = generateUniqueName();
+final String tableName = generateUniqueName();
+final String indexName = generate
[phoenix] branch 4.x updated: PHOENIX-6309 : Use maven enforcer plugin to ban imports from illegal packages (as per project guidelines)
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 f1df239 PHOENIX-6309 : Use maven enforcer plugin to ban imports from
illegal packages (as per project guidelines)
f1df239 is described below
commit f1df2391feb47e227de0f37555c4bc090c1af798
Author: Viraj Jasani
AuthorDate: Sun Jan 10 20:34:49 2021 +0530
PHOENIX-6309 : Use maven enforcer plugin to ban imports from illegal
packages (as per project guidelines)
---
pom.xml | 34 ++
1 file changed, 34 insertions(+)
diff --git a/pom.xml b/pom.xml
index 2d8b333..4d6ddd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,7 @@
2.9
1.9.1
3.0.0-M3
+
1.1.0
3.2.4
3.1.1
4.1.3
@@ -417,6 +418,39 @@
protobuf-maven-plugin
${protobuf.plugin.version}
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ ${maven-enforcer-plugin.version}
+
+
+ de.skuzzle.enforcer
+ restrict-imports-enforcer-rule
+ ${restrict-imports.enforcer.version}
+
+
+
+
+ banned-illegal-imports
+ process-sources
+
+enforce
+
+
+
+
+true
+Use SLF4j for logging
+
+
org.apache.commons.logging.Log
+
org.apache.commons.logging.LogFactory
+
+
+
+
+
+
+
[phoenix] branch master updated: PHOENIX-6309 : Use maven enforcer plugin to ban imports from illegal packages (as per project guidelines)
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 6d43aa2 PHOENIX-6309 : Use maven enforcer plugin to ban imports from
illegal packages (as per project guidelines)
6d43aa2 is described below
commit 6d43aa23e7c1b83778db26313a96fcd4fdf523eb
Author: Viraj Jasani
AuthorDate: Sun Jan 10 20:34:49 2021 +0530
PHOENIX-6309 : Use maven enforcer plugin to ban imports from illegal
packages (as per project guidelines)
---
pom.xml | 48
1 file changed, 48 insertions(+)
diff --git a/pom.xml b/pom.xml
index 4256c36..85ec281 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,7 @@
2.9
1.9.1
3.0.0-M3
+
1.1.0
3.2.4
${antlr.version}
3.1.1
@@ -453,6 +454,53 @@
protobuf-maven-plugin
${protobuf.plugin.version}
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ ${maven-enforcer-plugin.version}
+
+
+ de.skuzzle.enforcer
+ restrict-imports-enforcer-rule
+ ${restrict-imports.enforcer.version}
+
+
+
+
+ banned-illegal-imports
+ process-sources
+
+enforce
+
+
+
+
+true
+Use SLF4j for logging
+
+
org.apache.commons.logging.Log
+
org.apache.commons.logging.LogFactory
+
+
+
+true
+Use shaded version in phoenix-thirdparty
+
+ com.google.common.**
+
+
+
+true
+Use commons lang 3
+
+ org.apache.commons.lang.**
+
+
+
+
+
+
+
[phoenix] branch master updated: PHOENIX-6305 Throttling decision does not take offheap memstore size into account
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 edbd6e8 PHOENIX-6305 Throttling decision does not take offheap
memstore size into account
edbd6e8 is described below
commit edbd6e8a78c098c3a6df73496272d2dd4858feec
Author: Istvan Toth
AuthorDate: Thu Jan 7 12:56:07 2021 +0100
PHOENIX-6305 Throttling decision does not take offheap memstore size into
account
Co-authored-by: Ankit Singhal
---
.../apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index 9bca44e..d96dfe3 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -260,7 +260,9 @@ public class UngroupedAggregateRegionObserver extends
BaseScannerRegionObserver
Mutation[] mutationArray = new Mutation[mutations.size()];
// When memstore size reaches blockingMemstoreSize we are waiting 3
seconds for the
// flush happen which decrease the memstore size and then writes allowed
on the region.
- for (int i = 0; blockingMemstoreSize > 0 && region.getMemStoreHeapSize()
> blockingMemstoreSize && i < 30; i++) {
+ for (int i = 0; blockingMemstoreSize > 0
+ && region.getMemStoreHeapSize() +
region.getMemStoreOffHeapSize() > blockingMemstoreSize
+ && i < 30; i++) {
try {
checkForRegionClosingOrSplitting();
Thread.sleep(100);
[phoenix] branch master updated: PHOENIX-6306 slf4j exclusion from phoenix-server doesn't work
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 132aed1 PHOENIX-6306 slf4j exclusion from phoenix-server doesn't work 132aed1 is described below commit 132aed1f487a11dcf9445a1f3c62974cd22e442d Author: Istvan Toth AuthorDate: Thu Jan 7 13:27:45 2021 +0100 PHOENIX-6306 slf4j exclusion from phoenix-server doesn't work --- phoenix-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 54f924f..be4324c 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -119,7 +119,7 @@ sqlline:sqlline log4j:log4j org.slf4j:slf4j-api -org.slf4j:slf4j-log4j +org.slf4j:slf4j-log4j12 org.apache.phoenix:phoenix-hbase-compat*
[phoenix] branch 4.x updated: PHOENIX-3499 Enable null value for quote character for CSVBulkLoad tool
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 43b56d4 PHOENIX-3499 Enable null value for quote character for
CSVBulkLoad tool
43b56d4 is described below
commit 43b56d40e9d38a4120865be4bac098236fb5fe26
Author: Sergey Soldatov
AuthorDate: Fri Nov 18 03:24:00 2016 -0800
PHOENIX-3499 Enable null value for quote character for CSVBulkLoad tool
---
.../apache/phoenix/end2end/CsvBulkLoadToolIT.java | 37 +-
.../phoenix/mapreduce/CsvBulkImportUtil.java | 10 +++---
.../apache/phoenix/mapreduce/CsvBulkLoadTool.java | 26 +--
.../phoenix/mapreduce/CsvToKeyValueMapper.java | 2 +-
4 files changed, 60 insertions(+), 15 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
index 6f10d71..2de2c82 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
@@ -139,7 +139,6 @@ public class CsvBulkLoadToolIT extends BaseOwnClusterIT {
stmt.close();
}
-
@Test
public void testImportWithTabs() throws Exception {
@@ -173,6 +172,42 @@ public class CsvBulkLoadToolIT extends BaseOwnClusterIT {
}
@Test
+public void testImportWithTabsAndEmptyQuotes() throws Exception {
+
+Statement stmt = conn.createStatement();
+stmt.execute("CREATE TABLE TABLE8 (ID INTEGER NOT NULL PRIMARY KEY, " +
+"NAME1 VARCHAR, NAME2 VARCHAR)");
+
+FileSystem fs = FileSystem.get(getUtility().getConfiguration());
+FSDataOutputStream outputStream = fs.create(new
Path("/tmp/input8.csv"));
+PrintWriter printWriter = new PrintWriter(outputStream);
+printWriter.println("1\t\"\\t123\tName 2a");
+printWriter.println("2\tName 2a\tName 2b");
+printWriter.close();
+
+CsvBulkLoadTool csvBulkLoadTool = new CsvBulkLoadTool();
+csvBulkLoadTool.setConf(getUtility().getConfiguration());
+int exitCode = csvBulkLoadTool.run(new String[] {
+"--input", "/tmp/input8.csv",
+"--table", "table8",
+"--zookeeper", zkQuorum,
+"-q", "\"\"",
+"-e", "\"\"",
+"--delimiter", "\\t"
+});
+assertEquals(0, exitCode);
+
+ResultSet rs = stmt.executeQuery("SELECT id, name1, name2 FROM table8
ORDER BY id");
+assertTrue(rs.next());
+assertEquals(1, rs.getInt(1));
+assertEquals("\"\\t123", rs.getString(2));
+assertEquals("Name 2a", rs.getString(3));
+
+rs.close();
+stmt.close();
+}
+
+@Test
public void testFullOptionImport() throws Exception {
Statement stmt = conn.createStatement();
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
index ff9ff72..4ea2d21 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
@@ -41,8 +41,8 @@ public class CsvBulkImportUtil {
* @param arrayDelimiter array delimiter character, can be null
* @param binaryEncoding
*/
-public static void initCsvImportJob(Configuration conf, char
fieldDelimiter, char quoteChar,
-char escapeChar, String arrayDelimiter, String binaryEncoding) {
+public static void initCsvImportJob(Configuration conf, char
fieldDelimiter, Character quoteChar,
+Character escapeChar, String arrayDelimiter, String
binaryEncoding) {
setChar(conf, CsvToKeyValueMapper.FIELD_DELIMITER_CONFKEY,
fieldDelimiter);
setChar(conf, CsvToKeyValueMapper.QUOTE_CHAR_CONFKEY, quoteChar);
setChar(conf, CsvToKeyValueMapper.ESCAPE_CHAR_CONFKEY, escapeChar);
@@ -67,8 +67,10 @@ public class CsvBulkImportUtil {
}
@VisibleForTesting
-static void setChar(Configuration conf, String confKey, char charValue) {
-conf.set(confKey,
Base64.encodeBytes(Character.toString(charValue).getBytes()));
+static void setChar(Configuration conf, String confKey, Character
charValue) {
+if(charValue!=null) {
+conf.set(confKey,
Base64.encodeBytes(charValue.toString().getBytes()));
+}
}
@VisibleForTesting
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapr
[phoenix] branch master updated: PHOENIX-3499 Enable null value for quote character for CSVBulkLoad tool
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 5ef5faa PHOENIX-3499 Enable null value for quote character for
CSVBulkLoad tool
5ef5faa is described below
commit 5ef5faa63b8d7f68c327239a1c66de11876dc80c
Author: Sergey Soldatov
AuthorDate: Fri Nov 18 03:24:00 2016 -0800
PHOENIX-3499 Enable null value for quote character for CSVBulkLoad tool
---
.../apache/phoenix/end2end/CsvBulkLoadToolIT.java | 37 +-
.../phoenix/mapreduce/CsvBulkImportUtil.java | 11 ---
.../apache/phoenix/mapreduce/CsvBulkLoadTool.java | 26 +--
.../phoenix/mapreduce/CsvToKeyValueMapper.java | 2 +-
4 files changed, 61 insertions(+), 15 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
index e1c8714..81c2255 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
@@ -139,7 +139,6 @@ public class CsvBulkLoadToolIT extends BaseOwnClusterIT {
stmt.close();
}
-
@Test
public void testImportWithTabs() throws Exception {
@@ -173,6 +172,42 @@ public class CsvBulkLoadToolIT extends BaseOwnClusterIT {
}
@Test
+public void testImportWithTabsAndEmptyQuotes() throws Exception {
+
+Statement stmt = conn.createStatement();
+stmt.execute("CREATE TABLE TABLE8 (ID INTEGER NOT NULL PRIMARY KEY, " +
+"NAME1 VARCHAR, NAME2 VARCHAR)");
+
+FileSystem fs = FileSystem.get(getUtility().getConfiguration());
+FSDataOutputStream outputStream = fs.create(new
Path("/tmp/input8.csv"));
+PrintWriter printWriter = new PrintWriter(outputStream);
+printWriter.println("1\t\"\\t123\tName 2a");
+printWriter.println("2\tName 2a\tName 2b");
+printWriter.close();
+
+CsvBulkLoadTool csvBulkLoadTool = new CsvBulkLoadTool();
+csvBulkLoadTool.setConf(getUtility().getConfiguration());
+int exitCode = csvBulkLoadTool.run(new String[] {
+"--input", "/tmp/input8.csv",
+"--table", "table8",
+"--zookeeper", zkQuorum,
+"-q", "\"\"",
+"-e", "\"\"",
+"--delimiter", "\\t"
+});
+assertEquals(0, exitCode);
+
+ResultSet rs = stmt.executeQuery("SELECT id, name1, name2 FROM table8
ORDER BY id");
+assertTrue(rs.next());
+assertEquals(1, rs.getInt(1));
+assertEquals("\"\\t123", rs.getString(2));
+assertEquals("Name 2a", rs.getString(3));
+
+rs.close();
+stmt.close();
+}
+
+@Test
public void testFullOptionImport() throws Exception {
Statement stmt = conn.createStatement();
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
index b992f82..21787b2 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/CsvBulkImportUtil.java
@@ -43,8 +43,8 @@ public class CsvBulkImportUtil {
* @param arrayDelimiter array delimiter character, can be null
* @param binaryEncoding
*/
-public static void initCsvImportJob(Configuration conf, char
fieldDelimiter, char quoteChar,
-char escapeChar, String arrayDelimiter, String binaryEncoding) {
+public static void initCsvImportJob(Configuration conf, char
fieldDelimiter, Character quoteChar,
+Character escapeChar, String arrayDelimiter, String
binaryEncoding) {
setChar(conf, CsvToKeyValueMapper.FIELD_DELIMITER_CONFKEY,
fieldDelimiter);
setChar(conf, CsvToKeyValueMapper.QUOTE_CHAR_CONFKEY, quoteChar);
setChar(conf, CsvToKeyValueMapper.ESCAPE_CHAR_CONFKEY, escapeChar);
@@ -69,8 +69,11 @@ public class CsvBulkImportUtil {
}
@VisibleForTesting
-static void setChar(Configuration conf, String confKey, char charValue) {
-conf.set(confKey,
Bytes.toString(Base64.getEncoder().encode(Character.toString(charValue).getBytes(;
+
+static void setChar(Configuration conf, String confKey, Character
charValue) {
+if(charValue!=null) {
+conf.set(confKey,
Bytes.toString(Base64.getEncoder().encode(charValue.toString().getBytes(;
+}
}
@VisibleForTesting
diff --gi
[phoenix-connectors] branch master updated: PHOENIX-6303 bump Scala version for spark connector to 2.11.12, the same that Spark 2.4.7 uses
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 e6f5512 PHOENIX-6303 bump Scala version for spark connector to 2.11.12, the same that Spark 2.4.7 uses e6f5512 is described below commit e6f551252af1d78e55364219cef91775d0088296 Author: Istvan Toth AuthorDate: Wed Jan 6 15:13:32 2021 +0100 PHOENIX-6303 bump Scala version for spark connector to 2.11.12, the same that Spark 2.4.7 uses --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b8f136..25ffaf9 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ 1.4.0 0.9.0.0 2.4.0 -2.11.8 +2.11.12 2.11 1.2.17
[phoenix] branch 4.x updated: PHOENIX-3633 null pointer exception when subsquery for not exists returns empty result set
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 f4d96c0 PHOENIX-3633 null pointer exception when subsquery for not
exists returns empty result set
f4d96c0 is described below
commit f4d96c0c6c5191b357e9aba2c118d520f54ea45f
Author: Istvan Toth
AuthorDate: Wed Jan 6 11:03:06 2021 +0100
PHOENIX-3633 null pointer exception when subsquery for not exists returns
empty result set
Co-authored-by: Jerry He
---
.../apache/phoenix/end2end/join/SubqueryIT.java| 24 +++---
.../apache/phoenix/compile/ExpressionCompiler.java | 6 --
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryIT.java
index 69e8008..e563ca6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryIT.java
@@ -508,10 +508,10 @@ public class SubqueryIT extends BaseJoinIT {
assertEquals(rs.getString(2), "T5");
assertFalse(rs.next());
-
+
rs = conn.createStatement().executeQuery("EXPLAIN " + query);
assertPlansEqual(plans[3], QueryUtil.getExplainPlan(rs));
-
+
query = "SELECT * FROM " + tableName5 + " co WHERE EXISTS (SELECT
1 FROM " + tableName1 + " i WHERE NOT EXISTS (SELECT 1 FROM " + tableName4 + "
WHERE \"item_id\" = i.\"item_id\") AND co.item_id = \"item_id\" AND name =
co.item_name)"
+ " OR EXISTS (SELECT 1 FROM " + tableName1 + " WHERE
\"item_id\" IN (SELECT \"item_id\" FROM " + tableName4 + ") AND co.co_item_id =
\"item_id\" AND name = co.co_item_name)";
statement = conn.prepareStatement(query);
@@ -528,10 +528,28 @@ public class SubqueryIT extends BaseJoinIT {
assertEquals(rs.getString(4), "T1");
assertFalse(rs.next());
-
+
rs = conn.createStatement().executeQuery("EXPLAIN " + query);
String plan = QueryUtil.getExplainPlan(rs);
assertPlansMatch(plans[2], plan);
+
+//PHOENIX-3633
+query = "SELECT * FROM " + tableName4 + " o WHERE NOT EXISTS
(SELECT 1 FROM " + tableName1 + " i WHERE \"item_id\" = 'does not exist')";
+statement = conn.prepareStatement(query);
+rs = statement.executeQuery();
+assertTrue (rs.next());
+assertEquals(rs.getString(1), "001");
+assertTrue (rs.next());
+assertEquals(rs.getString(1), "002");
+assertTrue (rs.next());
+assertEquals(rs.getString(1), "003");
+assertTrue (rs.next());
+assertEquals(rs.getString(1), "004");
+assertTrue (rs.next());
+assertEquals(rs.getString(1), "005");
+
+assertFalse(rs.next());
+
} finally {
conn.close();
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index d430427..a993cea 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -1217,8 +1217,10 @@ public class ExpressionCompiler extends
UnsupportedAllParseNodeVisitor l)
throws SQLException {
LiteralExpression child = (LiteralExpression) l.get(0);
-PhoenixArray array = (PhoenixArray) child.getValue();
-return LiteralExpression.newConstant(array.getDimensions() > 0 ^
node.isNegate(), PBoolean.INSTANCE);
+boolean elementExists = child != null
+&& child.getValue() != null
+&& ((PhoenixArray)child.getValue()).getDimensions() > 0;
+return LiteralExpression.newConstant(elementExists ^ node.isNegate(),
PBoolean.INSTANCE);
}
@Override
[phoenix] branch master updated: PHOENIX-3633 null pointer exception when subsquery for not exists returns empty result set
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 8df1dbc PHOENIX-3633 null pointer exception when subsquery for not
exists returns empty result set
8df1dbc is described below
commit 8df1dbc25ebd594ff7cf1d622e2ea30d4a63f580
Author: Istvan Toth
AuthorDate: Wed Jan 6 11:03:06 2021 +0100
PHOENIX-3633 null pointer exception when subsquery for not exists returns
empty result set
Co-authored-by: Jerry He
---
.../apache/phoenix/end2end/join/SubqueryIT.java| 24 +++---
.../apache/phoenix/compile/ExpressionCompiler.java | 6 --
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryIT.java
index 4816cbf..8c7ea04 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/SubqueryIT.java
@@ -510,10 +510,10 @@ public class SubqueryIT extends BaseJoinIT {
assertEquals(rs.getString(2), "T5");
assertFalse(rs.next());
-
+
rs = conn.createStatement().executeQuery("EXPLAIN " + query);
assertPlansEqual(plans[3], QueryUtil.getExplainPlan(rs));
-
+
query = "SELECT * FROM " + tableName5 + " co WHERE EXISTS (SELECT
1 FROM " + tableName1 + " i WHERE NOT EXISTS (SELECT 1 FROM " + tableName4 + "
WHERE \"item_id\" = i.\"item_id\") AND co.item_id = \"item_id\" AND name =
co.item_name)"
+ " OR EXISTS (SELECT 1 FROM " + tableName1 + " WHERE
\"item_id\" IN (SELECT \"item_id\" FROM " + tableName4 + ") AND co.co_item_id =
\"item_id\" AND name = co.co_item_name)";
statement = conn.prepareStatement(query);
@@ -530,10 +530,28 @@ public class SubqueryIT extends BaseJoinIT {
assertEquals(rs.getString(4), "T1");
assertFalse(rs.next());
-
+
rs = conn.createStatement().executeQuery("EXPLAIN " + query);
String plan = QueryUtil.getExplainPlan(rs);
assertPlansMatch(plans[2], plan);
+
+//PHOENIX-3633
+query = "SELECT * FROM " + tableName4 + " o WHERE NOT EXISTS
(SELECT 1 FROM " + tableName1 + " i WHERE \"item_id\" = 'does not exist')";
+statement = conn.prepareStatement(query);
+rs = statement.executeQuery();
+assertTrue (rs.next());
+assertEquals(rs.getString(1), "001");
+assertTrue (rs.next());
+assertEquals(rs.getString(1), "002");
+assertTrue (rs.next());
+assertEquals(rs.getString(1), "003");
+assertTrue (rs.next());
+assertEquals(rs.getString(1), "004");
+assertTrue (rs.next());
+assertEquals(rs.getString(1), "005");
+
+assertFalse(rs.next());
+
} finally {
conn.close();
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index c39621f..ff731bd 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -1222,8 +1222,10 @@ public class ExpressionCompiler extends
UnsupportedAllParseNodeVisitor l)
throws SQLException {
LiteralExpression child = (LiteralExpression) l.get(0);
-PhoenixArray array = (PhoenixArray) child.getValue();
-return LiteralExpression.newConstant(array.getDimensions() > 0 ^
node.isNegate(), PBoolean.INSTANCE);
+boolean elementExists = child != null
+&& child.getValue() != null
+&& ((PhoenixArray)child.getValue()).getDimensions() > 0;
+return LiteralExpression.newConstant(elementExists ^ node.isNegate(),
PBoolean.INSTANCE);
}
@Override
[phoenix] branch 4.x updated: PHOENIX-6293 PHOENIX-6193 breaks projects depending on the phoenix-client artifact
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 16c0bb4 PHOENIX-6293 PHOENIX-6193 breaks projects depending on the phoenix-client artifact 16c0bb4 is described below commit 16c0bb4337b8ea3efa60e6943395420bb882ae2b Author: Istvan Toth AuthorDate: Mon Jan 4 10:09:20 2021 +0100 PHOENIX-6293 PHOENIX-6193 breaks projects depending on the phoenix-client artifact --- .gitignore| 2 +- phoenix-client-parent/pom.xml | 10 +- pom.xml | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2f47957..07d9567 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ # eclipse stuffs .settings/* -*/.settings/ +**/.settings/ .classpath .project */.externalToolBuilders diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml index 079df61..d54201b 100644 --- a/phoenix-client-parent/pom.xml +++ b/phoenix-client-parent/pom.xml @@ -48,7 +48,15 @@ true - + + +org.apache.rat +apache-rat-plugin + + true + + org.apache.maven.plugins maven-jar-plugin diff --git a/pom.xml b/pom.xml index 27a772f..2d8b333 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,7 @@ phoenix-hbase-compat-1.3.0 phoenix-core phoenix-pherf +phoenix-client-parent phoenix-client-parent/phoenix-client phoenix-server
[phoenix] branch master updated: PHOENIX-6293 PHOENIX-6193 breaks projects depending on the phoenix-client artifact
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 0bac803 PHOENIX-6293 PHOENIX-6193 breaks projects depending on the phoenix-client artifact 0bac803 is described below commit 0bac803eb887da9ac4c5845eb96ace25743edead Author: Istvan Toth AuthorDate: Mon Jan 4 10:09:20 2021 +0100 PHOENIX-6293 PHOENIX-6193 breaks projects depending on the phoenix-client artifact --- .gitignore| 2 +- phoenix-client-parent/pom.xml | 10 +- pom.xml | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 85a0b49..3921626 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ # eclipse stuffs .settings/* -*/.settings/ +**/.settings/ .classpath .project */.externalToolBuilders diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml index 4cd3f73..a935a36 100644 --- a/phoenix-client-parent/pom.xml +++ b/phoenix-client-parent/pom.xml @@ -48,7 +48,15 @@ true - + + +org.apache.rat +apache-rat-plugin + + true + + org.apache.maven.plugins maven-jar-plugin diff --git a/pom.xml b/pom.xml index df6d2c7..4256c36 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,7 @@ phoenix-hbase-compat-2.1.6 phoenix-core phoenix-pherf +phoenix-client-parent phoenix-client-parent/phoenix-client phoenix-server
[phoenix] branch 4.x updated: PHOENIX-6296 Synchronize @Parameters, @BeforeClass and @AfterClass methods take 2
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 3116705 PHOENIX-6296 Synchronize @Parameters, @BeforeClass and
@AfterClass methods take 2
3116705 is described below
commit 3116705dff0c71d4230ace81aee8a9e89d36b697
Author: Istvan Toth
AuthorDate: Mon Jan 4 15:54:21 2021 +0100
PHOENIX-6296 Synchronize @Parameters, @BeforeClass and @AfterClass methods
take 2
---
phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java | 2 +-
.../src/it/java/org/apache/phoenix/end2end/IndexToolTimeRangeIT.java | 2 +-
.../src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java| 2 +-
.../java/org/apache/phoenix/end2end/RowValueConstructorOffsetIT.java | 4 ++--
.../apache/phoenix/end2end/RowValueConstructorOffsetOptionalIT.java | 4 ++--
.../src/it/java/org/apache/phoenix/end2end/ViewIndexIdRetrieveIT.java | 2 +-
.../org/apache/phoenix/end2end/index/ImmutableIndexExtendedIT.java| 2 +-
.../phoenix/end2end/index/IndexVerificationOutputRepositoryIT.java| 2 +-
.../phoenix/end2end/index/IndexVerificationResultRepositoryIT.java| 2 +-
.../it/java/org/apache/phoenix/query/MaxConcurrentConnectionsIT.java | 4 ++--
.../src/test/java/org/apache/phoenix/schema/MetaDataClientTest.java | 2 +-
.../src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java | 2 +-
12 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
index daf2454..5ac07a1 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
@@ -82,7 +82,7 @@ public abstract class BaseQueryIT extends
ParallelStatsDisabledIT {
private static final Logger LOGGER =
LoggerFactory.getLogger(BaseQueryIT.class);
@BeforeParam
-public static void initTables(String idxDdl, boolean columnEncoded,
+public static synchronized void initTables(String idxDdl, boolean
columnEncoded,
boolean keepDeletedCells) throws Exception {
StringBuilder optionBuilder = new StringBuilder();
if (!columnEncoded) {
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolTimeRangeIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolTimeRangeIT.java
index 993a2a4..15d0e49 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolTimeRangeIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolTimeRangeIT.java
@@ -218,7 +218,7 @@ public class IndexToolTimeRangeIT extends
BaseUniqueNamesOwnClusterIT {
}
@AfterClass
-public static void teardown() {
+public static synchronized void teardown() {
tearDownMiniClusterAsync(2);
}
}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java
index 586147f..66f87fd 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java
@@ -66,7 +66,7 @@ public class IndexUpgradeToolIT extends BaseTest {
}
@BeforeClass
-public static void setup() throws Exception {
+public static synchronized void setup() throws Exception {
Map props = Collections.emptyMap();
setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorOffsetIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorOffsetIT.java
index 0981757..debf1ec 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorOffsetIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorOffsetIT.java
@@ -76,7 +76,7 @@ public class RowValueConstructorOffsetIT extends
ParallelStatsDisabledIT {
private static Connection conn = null;
@BeforeClass
-public static void init() throws SQLException {
+public static synchronized void init() throws SQLException {
conn = DriverManager.getConnection(getUrl(),
PropertiesUtil.deepCopy(TEST_PROPERTIES));
String dataTableDDL = String.format(DATA_DDL, DATA_TABLE_NAME);
@@ -125,7 +125,7 @@ public class RowValueConstructorOffsetIT extends
ParallelStatsDisabledIT {
}
@AfterClass
-public static void cleanup() {
+public static synchronized void cleanup() {
try {
if (conn != null) {
conn.close();
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorOffsetOptionalIT.java
b/phoenix-core/src
[phoenix] branch master updated: PHOENIX-6296 Synchronize @Parameters, @BeforeClass and @AfterClass methods take 2
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 4d8fcb7 PHOENIX-6296 Synchronize @Parameters, @BeforeClass and
@AfterClass methods take 2
4d8fcb7 is described below
commit 4d8fcb71fdfab9bcfcc88622dc2db4d973225f14
Author: Istvan Toth
AuthorDate: Mon Jan 4 15:40:24 2021 +0100
PHOENIX-6296 Synchronize @Parameters, @BeforeClass and @AfterClass methods
take 2
---
.../src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java | 2 +-
phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java | 2 +-
.../src/it/java/org/apache/phoenix/end2end/IndexToolTimeRangeIT.java | 2 +-
.../src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java| 2 +-
.../it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java| 2 +-
.../java/org/apache/phoenix/end2end/RowValueConstructorOffsetIT.java | 4 ++--
.../apache/phoenix/end2end/RowValueConstructorOffsetOptionalIT.java | 4 ++--
.../src/it/java/org/apache/phoenix/end2end/ViewIndexIdRetrieveIT.java | 2 +-
.../org/apache/phoenix/end2end/index/ImmutableIndexExtendedIT.java| 2 +-
.../phoenix/end2end/index/IndexVerificationOutputRepositoryIT.java| 2 +-
.../phoenix/end2end/index/IndexVerificationResultRepositoryIT.java| 2 +-
.../it/java/org/apache/phoenix/end2end/index/ShortViewIndexIdIT.java | 2 +-
.../org/apache/phoenix/util/CoprocessorHConnectionTableFactoryIT.java | 2 +-
.../src/test/java/org/apache/phoenix/schema/MetaDataClientTest.java | 2 +-
.../src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java | 2 +-
15 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
index 44f383d..2be1551 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BasePermissionsIT.java
@@ -155,7 +155,7 @@ public abstract class BasePermissionsIT extends BaseTest {
}
@BeforeClass
-public static void skipHBase21() {
+public static synchronized void skipHBase21() {
assumeFalse(VersionInfo.getVersion().startsWith("2.1"));
}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
index ef33b93..8154ba0 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
@@ -82,7 +82,7 @@ public abstract class BaseQueryIT extends
ParallelStatsDisabledIT {
private static final Logger LOGGER =
LoggerFactory.getLogger(BaseQueryIT.class);
@BeforeParam
-public static void initTables(String idxDdl, boolean columnEncoded,
+public static synchronized void initTables(String idxDdl, boolean
columnEncoded,
boolean keepDeletedCells) throws Exception {
StringBuilder optionBuilder = new StringBuilder();
if (!columnEncoded) {
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolTimeRangeIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolTimeRangeIT.java
index 57e3c11..9f6db56 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolTimeRangeIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolTimeRangeIT.java
@@ -226,7 +226,7 @@ public class IndexToolTimeRangeIT extends
BaseUniqueNamesOwnClusterIT {
}
@AfterClass
-public static void teardown() {
+public static synchronized void teardown() {
tearDownMiniClusterAsync(2);
}
}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java
index 586147f..66f87fd 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexUpgradeToolIT.java
@@ -66,7 +66,7 @@ public class IndexUpgradeToolIT extends BaseTest {
}
@BeforeClass
-public static void setup() throws Exception {
+public static synchronized void setup() throws Exception {
Map props = Collections.emptyMap();
setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java
index 4fe0b4b..8628d49 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsEnabledIT.java
@@ -
[phoenix-connectors] branch master updated: PHOENIX-6253 Change shaded connector jar naming convention
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 bfbf92e PHOENIX-6253 Change shaded connector jar naming convention
bfbf92e is described below
commit bfbf92e4c2f5318b391f382e21ebf47075f2c12a
Author: Istvan Toth
AuthorDate: Fri Dec 11 09:51:42 2020 +0100
PHOENIX-6253 Change shaded connector jar naming convention
---
phoenix-hive-base/pom.xml | 2 +-
phoenix-kafka-base/pom.xml | 11 +-
phoenix-pig-base/pom.xml | 3 +--
phoenix-spark-base/pom.xml | 2 +-
phoenix4-connectors-assembly/pom.xml | 21 +--
.../src/build/components/phoenix4-jars.xml | 24 +++---
phoenix5-connectors-assembly/pom.xml | 20 +-
.../src/build/components/phoenix5-jars.xml | 24 +++---
pom.xml| 2 --
9 files changed, 57 insertions(+), 52 deletions(-)
diff --git a/phoenix-hive-base/pom.xml b/phoenix-hive-base/pom.xml
index 5120a07..0bcd6c3 100644
--- a/phoenix-hive-base/pom.xml
+++ b/phoenix-hive-base/pom.xml
@@ -375,8 +375,8 @@
org.apache.maven.plugins
maven-shade-plugin
-
phoenix${phoenix.main.version}-${project.version}-hive
true
+true
*:*
diff --git a/phoenix-kafka-base/pom.xml b/phoenix-kafka-base/pom.xml
index 7b61e60..717cee4 100644
--- a/phoenix-kafka-base/pom.xml
+++ b/phoenix-kafka-base/pom.xml
@@ -204,8 +204,9 @@
org.apache.maven.plugins
maven-shade-plugin
-
phoenix${phoenix.main.version}-kafka-${project.version}-minimal
+true
true
+shaded-minimal
false
@@ -215,6 +216,14 @@
+
+
+ package
+
+shade
+
+
+
diff --git a/phoenix-pig-base/pom.xml b/phoenix-pig-base/pom.xml
index a80225e..d0aebbe 100644
--- a/phoenix-pig-base/pom.xml
+++ b/phoenix-pig-base/pom.xml
@@ -178,8 +178,7 @@
shade
-
phoenix${phoenix.main.version}-${project.version}-pig
-false
+true
true
false
diff --git a/phoenix-spark-base/pom.xml b/phoenix-spark-base/pom.xml
index 00fe45c..bff52fb 100644
--- a/phoenix-spark-base/pom.xml
+++ b/phoenix-spark-base/pom.xml
@@ -619,8 +619,8 @@
org.apache.maven.plugins
maven-shade-plugin
-
phoenix${phoenix.main.version}-${project.version}-spark
true
+true
*:*
diff --git a/phoenix4-connectors-assembly/pom.xml
b/phoenix4-connectors-assembly/pom.xml
index 7f8bd88..bde5ce9 100644
--- a/phoenix4-connectors-assembly/pom.xml
+++ b/phoenix4-connectors-assembly/pom.xml
@@ -73,10 +73,10 @@
-fnsv
- phoenix4-flume-${project.version}.jar
+ phoenix4-flume-${project.version}-shaded.jar
- phoenix4-flume.jar
+ phoenix4-flume-shaded.jar
@@ -93,10 +93,10 @@
-fnsv
- phoenix4-${project.version}-hive.jar
+ phoenix4-hive-${project.version}-shaded.jar
- phoenix4-hive.jar
+ phoenix4-hive-shaded.jar
@@ -113,10 +113,10 @@
-fnsv
- phoenix4-${project.version}-pig.jar
+ phoenix4-pig-${project.version}-shaded.jar
- phoenix4-pig.jar
+ phoenix4-pig-shaded.jar
@@ -133,10 +133,10 @@
-fnsv
- phoenix4-${project.version}-spark.jar
+ phoenix4-spark-${project.version}-shaded.jar
- phoenix4-spark.jar
+ phoenix4-spark-shaded.jar
@@ -153,10 +153,10 @@
-fnsv
- phoenix4-kafka-${project.version}-minimal.jar
+ phoenix4-kafka-${project.version}-shaded
[phoenix-queryserver] branch master updated: PHOENIX-6294 javax.servlet relocation added by PHOENIX-6151 breaks PQS
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 4ae7389 PHOENIX-6294 javax.servlet relocation added by PHOENIX-6151
breaks PQS
4ae7389 is described below
commit 4ae73892df19b4550c15668d6839e2ad7768ae7d
Author: Josh Elser
AuthorDate: Mon Jan 4 11:15:01 2021 +0100
PHOENIX-6294 javax.servlet relocation added by PHOENIX-6151 breaks PQS
---
phoenix-queryserver/pom.xml | 4
1 file changed, 4 insertions(+)
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index f5305e4..710518b 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -133,6 +133,10 @@
org.eclipse.jetty
${shaded.package}.org.eclipse.jetty
+
+ javax.servlet
+
${shaded.package}.javax.servlet
+
[phoenix] branch master updated: PHOENIX-6290 Extend IndexRegionSplitPolicy from SteppingSplitPolicy on master
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 8ca7a48 PHOENIX-6290 Extend IndexRegionSplitPolicy from
SteppingSplitPolicy on master
8ca7a48 is described below
commit 8ca7a48579ba1066c68e7e026fbfd4038d1e9725
Author: Istvan Toth
AuthorDate: Wed Dec 30 16:50:12 2020 +0100
PHOENIX-6290 Extend IndexRegionSplitPolicy from SteppingSplitPolicy on
master
---
.../java/org/apache/phoenix/hbase/index/IndexRegionSplitPolicy.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionSplitPolicy.java
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionSplitPolicy.java
index 8fd3da5..ee94494 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionSplitPolicy.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionSplitPolicy.java
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Optional;
import org.apache.hadoop.hbase.regionserver.HStore;
-import
org.apache.hadoop.hbase.regionserver.IncreasingToUpperBoundRegionSplitPolicy;
+import org.apache.hadoop.hbase.regionserver.SteppingSplitPolicy;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.query.QueryConstants;
@@ -29,7 +29,7 @@ import org.apache.phoenix.query.QueryConstants;
* Split policy for local indexed tables to select split key from non local
index column families
* always.
*/
-public class IndexRegionSplitPolicy extends
IncreasingToUpperBoundRegionSplitPolicy {
+public class IndexRegionSplitPolicy extends SteppingSplitPolicy {
@Override
protected boolean skipStoreFileRangeCheck(String familyName) {
[phoenix] branch master updated: PHOENIX-6280 Support HBase 2.4
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 a3a19af PHOENIX-6280 Support HBase 2.4
a3a19af is described below
commit a3a19afcdc06f4834051f33b3a2adc4577b454c0
Author: Istvan Toth
AuthorDate: Thu Dec 24 11:25:31 2020 +0100
PHOENIX-6280 Support HBase 2.4
---
Jenkinsfile| 2 +-
phoenix-core/pom.xml | 19 ++
.../it/resources/compatible_client_versions.json | 3 +-
.../hadoop/hbase/ipc/PhoenixRpcScheduler.java | 2 +-
.../IndexHalfStoreFileReaderGenerator.java | 3 +-
.../org/apache/phoenix/execute/DelegateHTable.java | 5 -
.../hbase/index/parallel/ThreadPoolManager.java| 5 +-
.../apache/phoenix/schema/MetaDataSplitPolicy.java | 47 +++--
.../schema/SplitOnLeadingVarCharColumnsPolicy.java | 4 +-
.../phoenix/transaction/OmidTransactionTable.java | 5 -
.../phoenix/compat/hbase/CompatDelegateHTable.java | 8 +
.../compat/hbase/CompatOmidTransactionTable.java | 8 +
.../compat/hbase/CompatPhoenixRpcScheduler.java| 2 +-
...onTable.java => CompatSteppingSplitPolicy.java} | 10 +-
.../apache/phoenix/compat/hbase/CompatUtil.java| 9 +-
.../phoenix/compat/hbase/CompatDelegateHTable.java | 7 +
.../compat/hbase/CompatOmidTransactionTable.java | 8 +
.../compat/hbase/CompatPhoenixRpcScheduler.java| 2 +-
.../compat/hbase/CompatSteppingSplitPolicy.java| 10 +-
.../apache/phoenix/compat/hbase/CompatUtil.java| 8 +
.../phoenix/compat/hbase/CompatDelegateHTable.java | 6 +
.../compat/hbase/CompatOmidTransactionTable.java | 6 +
.../compat/hbase/CompatPhoenixRpcScheduler.java| 2 +-
.../compat/hbase/CompatSteppingSplitPolicy.java| 10 +-
.../apache/phoenix/compat/hbase/CompatUtil.java| 8 +
phoenix-hbase-compat-2.4.0/pom.xml | 102 +++
.../phoenix/compat/hbase/CompatDelegateHTable.java | 7 +
.../compat/hbase/CompatOmidTransactionTable.java | 7 +
.../phoenix/compat/hbase/CompatPermissionUtil.java | 59 ++
.../compat/hbase/CompatPhoenixRpcScheduler.java| 2 +-
.../compat/hbase/CompatSteppingSplitPolicy.java| 5 +-
.../compat/hbase/CompatStoreFileReader.java| 48 +
.../apache/phoenix/compat/hbase/CompatUtil.java| 8 +
.../compat/hbase/HbaseCompatCapabilities.java | 26 +--
.../apache/phoenix/compat/hbase/OffsetCell.java| 136 ++
.../CompatBaseScannerRegionObserver.java | 197 +
.../coprocessor/CompatIndexRegionObserver.java | 25 +--
.../phoenix/compat/hbase/test/DelegateCell.java| 139 +++
phoenix-server/pom.xml | 17 ++
pom.xml| 25 +++
40 files changed, 931 insertions(+), 71 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 5bb1ebd..1b4e1f5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
axes {
axis {
name 'HBASE_PROFILE'
-values '2.1', '2.2', '2.3'
+values '2.1', '2.2', '2.3', '2.4'
}
}
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 9f8efca..fd25797 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -70,6 +70,9 @@
|| ("${hbase.compat.version}".equals("2.3.0")
hbaseMinor == 3
hbasePatch =0)
+|| ("${hbase.compat.version}".equals("2.4.0")
+ hbaseMinor == 4
+ hbasePatch =0)
)
@@ -590,5 +593,21 @@
+
+phoenix-hbase-compat-2.4.0
+
+
+
+hbase.profile
+2.4
+
+
+
+
+org.apache.zookeeper
+zookeeper-jute
+
+
+
diff --git a/phoenix-core/src/it/resources/compatible_client_versions.json
b/phoenix-core/src/it/resources/compatible_client_versions.json
index 692cb38..aa94642 100644
--- a/phoenix-core/src/it/resources/compatible_client_versions.json
+++ b/phoenix-core/src/it/resources/compatible_client_versions.json
@@ -22,5 +22,6 @@
"1.5": ["4.15.0"],
"2.1": ["5.1.0"],
"2.2": ["5.1.0"],
-"2.3": ["5.1.0"]
+"2.3": ["5.1.0"],
+"2.4": ["5.1.0"]
}
diff --git
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/ipc/PhoenixRpcScheduler.java
index 4508a2d..9c56316 100644
---
a/pho
[phoenix] branch 4.x updated: PHOENIX-6288 Minicluster startup problems on Jenkins
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 237b724 PHOENIX-6288 Minicluster startup problems on Jenkins
237b724 is described below
commit 237b7248dafe51087a8a95aa5bc67e5ce141e89d
Author: Istvan Toth
AuthorDate: Wed Dec 30 16:16:47 2020 +0100
PHOENIX-6288 Minicluster startup problems on Jenkins
increase minicluster master startup timeout to 200 seconds
log minicluster startup time
---
phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java | 5 +
1 file changed, 5 insertions(+)
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
index bbe0371..05773fb 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
@@ -547,7 +547,10 @@ public abstract class BaseTest {
setUpConfigForMiniCluster(conf, overrideProps);
utility = new HBaseTestingUtility(conf);
try {
+long startTime = System.currentTimeMillis();
utility.startMiniCluster(NUM_SLAVES_BASE);
+long startupTime = System.currentTimeMillis()-startTime;
+LOGGER.info("HBase minicluster startup complete in {} ms",
startupTime);
return getLocalClusterUrl(utility);
} catch (Throwable t) {
throw new RuntimeException(t);
@@ -626,6 +629,8 @@ public abstract class BaseTest {
conf.setInt("hbase.assignment.zkevent.workers", 5);
conf.setInt("hbase.assignment.threads.max", 5);
conf.setInt("hbase.catalogjanitor.interval", 5000);
+//Allow for an extra long miniCluster startup time in case of an
overloaded test machine
+conf.setInt("hbase.master.start.timeout.localHBaseCluster", 20);
conf.setInt(QueryServices.TASK_HANDLING_INTERVAL_MS_ATTRIB, 1);
conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 2);
conf.setInt(NUM_CONCURRENT_INDEX_WRITER_THREADS_CONF_KEY, 1);
[phoenix] branch master updated: PHOENIX-6288 Minicluster startup problems on Jenkins
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 d097857 PHOENIX-6288 Minicluster startup problems on Jenkins
d097857 is described below
commit d0978570a65b3191cff046abdfbe95d0d04f1121
Author: Istvan Toth
AuthorDate: Wed Dec 30 16:16:47 2020 +0100
PHOENIX-6288 Minicluster startup problems on Jenkins
increase minicluster master startup timeout to 200 seconds
log minicluster startup time
---
phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java | 5 +
1 file changed, 5 insertions(+)
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
index 2960081..4894727 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
@@ -548,7 +548,10 @@ public abstract class BaseTest {
setUpConfigForMiniCluster(conf, overrideProps);
utility = new HBaseTestingUtility(conf);
try {
+long startTime = System.currentTimeMillis();
utility.startMiniCluster(NUM_SLAVES_BASE);
+long startupTime = System.currentTimeMillis()-startTime;
+LOGGER.info("HBase minicluster startup complete in {} ms",
startupTime);
return getLocalClusterUrl(utility);
} catch (Throwable t) {
throw new RuntimeException(t);
@@ -628,6 +631,8 @@ public abstract class BaseTest {
conf.setInt("hbase.assignment.zkevent.workers", 5);
conf.setInt("hbase.assignment.threads.max", 5);
conf.setInt("hbase.catalogjanitor.interval", 5000);
+//Allow for an extra long miniCluster startup time in case of an
overloaded test machine
+conf.setInt("hbase.master.start.timeout.localHBaseCluster", 20);
conf.setInt(QueryServices.TASK_HANDLING_INTERVAL_MS_ATTRIB, 1);
conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 2);
conf.setInt(NUM_CONCURRENT_INDEX_WRITER_THREADS_CONF_KEY, 1);
[phoenix] branch 4.x updated: PHOENIX-6286 Extend syscat RegionSplitPolicies from the default Policy for the HBase branch
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 7bdc3b4 PHOENIX-6286 Extend syscat RegionSplitPolicies from the
default Policy for the HBase branch
7bdc3b4 is described below
commit 7bdc3b4dce7e61fa73bf6d38b4a34c809fe54540
Author: Istvan Toth
AuthorDate: Wed Dec 30 08:42:50 2020 +0100
PHOENIX-6286 Extend syscat RegionSplitPolicies from the default Policy for
the HBase branch
---
.../org/apache/phoenix/schema/SplitOnLeadingVarCharColumnsPolicy.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/schema/SplitOnLeadingVarCharColumnsPolicy.java
b/phoenix-core/src/main/java/org/apache/phoenix/schema/SplitOnLeadingVarCharColumnsPolicy.java
index d481998..249038f 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/schema/SplitOnLeadingVarCharColumnsPolicy.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/schema/SplitOnLeadingVarCharColumnsPolicy.java
@@ -17,10 +17,10 @@
*/
package org.apache.phoenix.schema;
-import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;
+import
org.apache.hadoop.hbase.regionserver.IncreasingToUpperBoundRegionSplitPolicy;
import org.apache.phoenix.util.SchemaUtil;
-public abstract class SplitOnLeadingVarCharColumnsPolicy extends
ConstantSizeRegionSplitPolicy {
+public abstract class SplitOnLeadingVarCharColumnsPolicy extends
IncreasingToUpperBoundRegionSplitPolicy {
abstract protected int getColumnToSplitAt();
protected final byte[] getSplitPoint(byte[] splitPoint) {
[phoenix] branch master updated: PHOENIX-6286 Extend syscat RegionSplitPolicies from the default Policy for the HBase branch
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 1b5c873 PHOENIX-6286 Extend syscat RegionSplitPolicies from the
default Policy for the HBase branch
1b5c873 is described below
commit 1b5c873cc8487aee5ef9a447d2d645e0980ca44d
Author: Istvan Toth
AuthorDate: Wed Dec 30 08:39:51 2020 +0100
PHOENIX-6286 Extend syscat RegionSplitPolicies from the default Policy for
the HBase branch
---
.../org/apache/phoenix/schema/SplitOnLeadingVarCharColumnsPolicy.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/schema/SplitOnLeadingVarCharColumnsPolicy.java
b/phoenix-core/src/main/java/org/apache/phoenix/schema/SplitOnLeadingVarCharColumnsPolicy.java
index 6e0e856..80551f5 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/schema/SplitOnLeadingVarCharColumnsPolicy.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/schema/SplitOnLeadingVarCharColumnsPolicy.java
@@ -17,10 +17,10 @@
*/
package org.apache.phoenix.schema;
-import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;
+import org.apache.hadoop.hbase.regionserver.SteppingSplitPolicy;
import org.apache.phoenix.util.SchemaUtil;
-public abstract class SplitOnLeadingVarCharColumnsPolicy extends
ConstantSizeRegionSplitPolicy {
+public abstract class SplitOnLeadingVarCharColumnsPolicy extends
SteppingSplitPolicy {
abstract protected int getColumnToSplitAt();
protected final byte[] getSplitPoint(byte[] splitPoint) {
[phoenix] branch 4.x updated: PHOENIX-6283 MutableIndexExtendedIT#testCompactDisabledIndex consistently fails with HBase 2.3
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 0e8bef1 PHOENIX-6283 MutableIndexExtendedIT#testCompactDisabledIndex
consistently fails with HBase 2.3
0e8bef1 is described below
commit 0e8bef1f94bb5b0fb16dbe8da9198ef8158d02f1
Author: Istvan Toth
AuthorDate: Wed Dec 30 08:15:26 2020 +0100
PHOENIX-6283 MutableIndexExtendedIT#testCompactDisabledIndex consistently
fails with HBase 2.3
add missing test to 4.x
---
.../end2end/NoLookbackMutableIndexExtendedIT.java | 158 +
1 file changed, 158 insertions(+)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java
new file mode 100644
index 000..376a7b9
--- /dev/null
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java
@@ -0,0 +1,158 @@
+/*
+ * 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.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.regionserver.HRegion;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.phoenix.jdbc.PhoenixConnection;
+import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
+import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.schema.PIndexState;
+import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+import org.apache.phoenix.util.EnvironmentEdgeManager;
+import org.apache.phoenix.util.IndexUtil;
+import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.ReadOnlyProps;
+import org.apache.phoenix.util.SchemaUtil;
+import org.apache.phoenix.util.TestUtil;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+@Category(NeedsOwnMiniClusterTest.class)
+public class NoLookbackMutableIndexExtendedIT extends
BaseUniqueNamesOwnClusterIT {
+protected final boolean localIndex;
+protected final String tableDDLOptions;
+
+@BeforeClass
+public static synchronized void doSetup() throws Exception {
+Map props = Maps.newHashMapWithExpectedSize(1);
+setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
+}
+
+public NoLookbackMutableIndexExtendedIT(Boolean localIndex, String
txProvider, Boolean columnEncoded) {
+this.localIndex = localIndex;
+StringBuilder optionBuilder = new StringBuilder();
+if (txProvider != null) {
+optionBuilder
+.append("TRANSACTIONAL=true," +
PhoenixDatabaseMetaData.TRANSACTION_PROVIDER
++ "='" + txProvider + "'");
+}
+if (!columnEncoded) {
+if (optionBuilder.length() != 0) optionBuilder.append(",");
+optionBuilder.append("COLUMN_ENCODED_BYTES=0");
+}
+this.tableDDLOptions = optionBuilder.toString();
+}
+
+private static Connection getConnection(Properties props) throws
SQLException {
+
props.setProperty(QueryServices.INDEX_MUTATE_BATCH_SIZE_THRESHOLD_ATTRIB,
+Integer.toString(1));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+return conn;
+}
+
+protected static Connection getConnection() throws SQLException {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+return getConnection(props);
+}
+
+@Parameterized.Parameters(name =
[phoenix] branch master updated: PHOENIX-6283 MutableIndexExtendedIT#testCompactDisabledIndex consistently fails with HBase 2.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 c04a07b PHOENIX-6283 MutableIndexExtendedIT#testCompactDisabledIndex
consistently fails with HBase 2.3
c04a07b is described below
commit c04a07b25172e5bb195d71a5d5615a2c5295773c
Author: Istvan Toth
AuthorDate: Wed Dec 30 08:15:26 2020 +0100
PHOENIX-6283 MutableIndexExtendedIT#testCompactDisabledIndex consistently
fails with HBase 2.3
---
.../end2end/NoLookbackMutableIndexExtendedIT.java | 158 +
.../end2end/index/MutableIndexExtendedIT.java | 59
2 files changed, 158 insertions(+), 59 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java
new file mode 100644
index 000..376a7b9
--- /dev/null
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NoLookbackMutableIndexExtendedIT.java
@@ -0,0 +1,158 @@
+/*
+ * 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.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.regionserver.HRegion;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.phoenix.jdbc.PhoenixConnection;
+import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
+import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.schema.PIndexState;
+import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+import org.apache.phoenix.util.EnvironmentEdgeManager;
+import org.apache.phoenix.util.IndexUtil;
+import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.ReadOnlyProps;
+import org.apache.phoenix.util.SchemaUtil;
+import org.apache.phoenix.util.TestUtil;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+@Category(NeedsOwnMiniClusterTest.class)
+public class NoLookbackMutableIndexExtendedIT extends
BaseUniqueNamesOwnClusterIT {
+protected final boolean localIndex;
+protected final String tableDDLOptions;
+
+@BeforeClass
+public static synchronized void doSetup() throws Exception {
+Map props = Maps.newHashMapWithExpectedSize(1);
+setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
+}
+
+public NoLookbackMutableIndexExtendedIT(Boolean localIndex, String
txProvider, Boolean columnEncoded) {
+this.localIndex = localIndex;
+StringBuilder optionBuilder = new StringBuilder();
+if (txProvider != null) {
+optionBuilder
+.append("TRANSACTIONAL=true," +
PhoenixDatabaseMetaData.TRANSACTION_PROVIDER
++ "='" + txProvider + "'");
+}
+if (!columnEncoded) {
+if (optionBuilder.length() != 0) optionBuilder.append(",");
+optionBuilder.append("COLUMN_ENCODED_BYTES=0");
+}
+this.tableDDLOptions = optionBuilder.toString();
+}
+
+private static Connection getConnection(Properties props) throws
SQLException {
+
props.setProperty(QueryServices.INDEX_MUTATE_BATCH_SIZE_THRESHOLD_ATTRIB,
+Integer.toString(1));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+return conn;
+}
+
+protected static Connection getConnection() throws SQLException {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+ret
[phoenix] branch master updated: PHOENIX-6104 SplitSystemCatalogIT tests very unstable with Hbase 2.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 2adee98 PHOENIX-6104 SplitSystemCatalogIT tests very unstable with
Hbase 2.3
2adee98 is described below
commit 2adee985c74b74edc7b11c5b52774660f6a01fe9
Author: Istvan Toth
AuthorDate: Tue Dec 29 22:00:34 2020 +0100
PHOENIX-6104 SplitSystemCatalogIT tests very unstable with Hbase 2.3
Co-authored-by: Viraj Jasani
---
.../end2end/TableSnapshotReadsMapReduceIT.java | 29 -
.../java/org/apache/phoenix/query/BaseTest.java| 38 --
2 files changed, 28 insertions(+), 39 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java
index e493b17..39d70bb 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java
@@ -405,35 +405,6 @@ public class TableSnapshotReadsMapReduceIT extends
BaseUniqueNamesOwnClusterIT {
}
}
- private void splitTableSync(Admin admin, TableName hbaseTableName,
- byte[] splitPoint, int expectedRegions) throws IOException,
- InterruptedException {
-admin.split(hbaseTableName, splitPoint);
-AssignmentManager assignmentManager =
- getUtility().getHBaseCluster().getMaster().getAssignmentManager();
-// wait for split daughter regions coming online for ~20s
-for (int i = 0; i < 20; i++) {
- Thread.sleep(1000);
- List regions = getUtility().getHBaseCluster()
-.getRegions(hbaseTableName);
- if (regions.size() >= expectedRegions) {
-boolean allRegionsOnline = true;
-for (HRegion region : regions) {
- if (!assignmentManager.getRegionStates()
- .isRegionOnline(region.getRegionInfo())) {
-allRegionsOnline = false;
-break;
- }
-}
-if (allRegionsOnline) {
- break;
-}
- }
- LOGGER.info("Sleeping for 1000 ms while waiting for {} to split and all
regions to come online",
-hbaseTableName.getNameAsString());
-}
- }
-
private void deleteSnapshotIfExists(String snapshotName) throws Exception {
try (Connection conn = DriverManager.getConnection(getUrl());
Admin admin =
conn.unwrap(PhoenixConnection.class).getQueryServices().getAdmin()) {
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
index faf2a18..2960081 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
@@ -130,6 +130,7 @@ import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.assignment.AssignmentManager;
+import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.regionserver.RSRpcServices;
import org.apache.hadoop.hbase.util.Bytes;
@@ -1824,20 +1825,35 @@ public abstract class BaseTest {
}
phxConn.close();
}
-
/**
* Synchronously split table at the given split point
*/
-protected static void splitRegion(TableName fullTableName, byte[]
splitPoint) throws SQLException, IOException, InterruptedException {
-Admin admin =
-driver.getConnectionQueryServices(getUrl(),
TestUtil.TEST_PROPERTIES).getAdmin();
-admin.split(fullTableName, splitPoint);
-// make sure the split finishes (there's no synchronous splitting
before HBase 2.x)
-admin.disableTable(fullTableName);
-admin.enableTable(fullTableName);
+protected static void splitTableSync(Admin admin, TableName
hbaseTableName, byte[] splitPoint,
+int expectedRegions) throws IOException, InterruptedException {
+admin.split(hbaseTableName, splitPoint);
+for (int i = 0; i < 30; i++) {
+List regions =
getUtility().getHBaseCluster().getRegions(hbaseTableName);
+if (regions.size() >= expectedRegions) {
+boolean splitSuccessful = true;
+for (HRegion region : regions) {
+if (!region.isSplittable()) {
+splitSuccessful = false;
+}
+}
+if(splitSuccessful) {
+return;
+}
+}
+LOGGER.info(
+"Sleeping for 1000 ms wh
[phoenix] branch master updated: PHOENIX-6281 : Remove and ignore hbase-compat-1.x from Phoenix 5.x
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 1189b81 PHOENIX-6281 : Remove and ignore hbase-compat-1.x from
Phoenix 5.x
1189b81 is described below
commit 1189b8112c1e846b275c1a010aaba4fd5aea468b
Author: Viraj Jasani
AuthorDate: Sat Dec 26 13:02:35 2020 +0530
PHOENIX-6281 : Remove and ignore hbase-compat-1.x from Phoenix 5.x
---
.gitignore | 3 ++
.../coprocessor/CompatIndexRegionObserver.java | 48 --
.../coprocessor/CompatIndexRegionObserver.java | 40 --
3 files changed, 3 insertions(+), 88 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2f47957..85a0b49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@ RESULTS/
CSV_EXPORT/
.DS_Store
+phoenix-hbase-compat-1.3.0/
+phoenix-hbase-compat-1.4.0/
+phoenix-hbase-compat-1.5.0/
diff --git
a/phoenix-hbase-compat-1.4.0/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java
b/phoenix-hbase-compat-1.4.0/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java
deleted file mode 100644
index 60858a6..000
---
a/phoenix-hbase-compat-1.4.0/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java
+++ /dev/null
@@ -1,48 +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.
- */
-package org.apache.phoenix.compat.hbase.coprocessor;
-
-import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver;
-import org.apache.hadoop.hbase.coprocessor.ObserverContext;
-import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
-import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
-import org.apache.hadoop.hbase.wal.WALKey;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class CompatIndexRegionObserver extends BaseRegionObserver {
-
-public void preWALAppend(ObserverContext c,
WALKey key,
- WALEdit edit) {
-//no-op implementation for HBase 1.3 and 1.4 that doesn't support this
co-proc hook.
-}
-
-public static void appendToWALKey(WALKey key, String attrKey, byte[]
attrValue) {
-//no-op for HBase 1.3 and 1.4 because we don't have
WALKey.addExtendedAttribute(String,
-// byte[])
-}
-
-public static byte[] getAttributeValueFromWALKey(WALKey key, String
attrKey) {
-return null;
-}
-
-public static Map getAttributeValuesFromWALKey(WALKey key)
{
-return new HashMap();
-}
-}
diff --git
a/phoenix-hbase-compat-1.5.0/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java
b/phoenix-hbase-compat-1.5.0/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java
deleted file mode 100644
index b8eb0a5..000
---
a/phoenix-hbase-compat-1.5.0/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java
+++ /dev/null
@@ -1,40 +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.
- */
-package org.apache.phoenix.compat.hbase.coprocessor;
-
-import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver;
-import org.apache.hadoop.hbase.wal.WALKey;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public
[phoenix] branch master updated: PHOENIX-6261 Reorganise project structure to make mvn versions:set work (addendum: override parent depenencyManagement for all HBase compat dependencies)
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 2b68e84 PHOENIX-6261 Reorganise project structure to make mvn
versions:set work (addendum: override parent depenencyManagement for all HBase
compat dependencies)
2b68e84 is described below
commit 2b68e84c1867ad07960a09d6527f13106138262b
Author: Istvan Toth
AuthorDate: Thu Dec 24 08:34:40 2020 +0100
PHOENIX-6261 Reorganise project structure to make mvn versions:set work
(addendum: override parent depenencyManagement for all HBase compat
dependencies)
---
phoenix-hbase-compat-2.1.6/pom.xml | 43
phoenix-hbase-compat-2.2.1/pom.xml | 43
phoenix-hbase-compat-2.3.0/pom.xml | 81 +-
3 files changed, 148 insertions(+), 19 deletions(-)
diff --git a/phoenix-hbase-compat-2.1.6/pom.xml
b/phoenix-hbase-compat-2.1.6/pom.xml
index 0794dd5..6e64195 100644
--- a/phoenix-hbase-compat-2.1.6/pom.xml
+++ b/phoenix-hbase-compat-2.1.6/pom.xml
@@ -55,6 +55,49 @@
${hbase21.compat.version}
provided
+
+
+ org.apache.hbase
+ hbase-hadoop-compat
+ ${hbase21.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-hadoop2-compat
+ ${hbase21.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol
+ ${hbase21.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol-shaded
+ ${hbase21.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-zookeeper
+ ${hbase21.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics
+ ${hbase21.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics-api
+ ${hbase21.compat.version}
+ provided
+
diff --git a/phoenix-hbase-compat-2.2.1/pom.xml
b/phoenix-hbase-compat-2.2.1/pom.xml
index 34f8105..b5bb8b6 100644
--- a/phoenix-hbase-compat-2.2.1/pom.xml
+++ b/phoenix-hbase-compat-2.2.1/pom.xml
@@ -54,6 +54,49 @@
${hbase22.compat.version}
provided
+
+
+ org.apache.hbase
+ hbase-hadoop-compat
+ ${hbase22.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-hadoop2-compat
+ ${hbase22.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol
+ ${hbase22.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol-shaded
+ ${hbase22.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-zookeeper
+ ${hbase22.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics
+ ${hbase22.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics-api
+ ${hbase22.compat.version}
+ provided
+
diff --git a/phoenix-hbase-compat-2.3.0/pom.xml
b/phoenix-hbase-compat-2.3.0/pom.xml
index 4300624..a969193 100644
--- a/phoenix-hbase-compat-2.3.0/pom.xml
+++ b/phoenix-hbase-compat-2.3.0/pom.xml
@@ -35,25 +35,68 @@
-
-
-org.apache.hbase
-hbase-client
-${hbase23.compat.version}
-provided
-
-
-org.apache.hbase
-hbase-common
-${hbase23.compat.version}
-provided
-
-
-org.apache.hbase
-hbase-server
-${hbase23.compat.version}
-provided
-
+
+
+ org.apache.hbase
+ hbase-client
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-common
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-server
+ ${hbase23.compat.version}
+ provided
+
+
+
+ org.apache.hbase
+ hbase-hadoop-compat
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-hadoop2-compat
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol-shaded
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-zookeeper
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics-api
+ ${hbase23.compat.version}
+ provided
+
[phoenix] branch 4.x updated: PHOENIX-6261 Reorganise project structure to make mvn versions:set work (addendum: fix regression with -Dhbase.version)
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 33bd800 PHOENIX-6261 Reorganise project structure to make mvn
versions:set work (addendum: fix regression with -Dhbase.version)
33bd800 is described below
commit 33bd8008995157250b7f1444759bd8e7cefe051d
Author: Istvan Toth
AuthorDate: Thu Dec 24 08:01:19 2020 +0100
PHOENIX-6261 Reorganise project structure to make mvn versions:set work
(addendum: fix regression with -Dhbase.version)
---
phoenix-hbase-compat-1.3.0/pom.xml | 52 ++-
phoenix-hbase-compat-1.4.0/pom.xml | 64 +-
phoenix-hbase-compat-1.5.0/pom.xml | 64 +-
3 files changed, 177 insertions(+), 3 deletions(-)
diff --git a/phoenix-hbase-compat-1.3.0/pom.xml
b/phoenix-hbase-compat-1.3.0/pom.xml
index 1725cd6..faf351d 100644
--- a/phoenix-hbase-compat-1.3.0/pom.xml
+++ b/phoenix-hbase-compat-1.3.0/pom.xml
@@ -31,13 +31,63 @@
Compatibility module for HBase 1.3.0+
-1.3.0
+1.3.0
+
org.apache.hbase
hbase-server
+ ${hbase13.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-common
+ ${hbase13.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-annotations
+ ${hbase13.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-common
+ ${hbase13.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol
+ ${hbase13.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-client
+ ${hbase13.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-procedure
+ ${hbase13.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-hadoop-compat
+ ${hbase13.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-hadoop2-compat
+ ${hbase13.version}
provided
diff --git a/phoenix-hbase-compat-1.4.0/pom.xml
b/phoenix-hbase-compat-1.4.0/pom.xml
index a4c3b59..45c038f 100644
--- a/phoenix-hbase-compat-1.4.0/pom.xml
+++ b/phoenix-hbase-compat-1.4.0/pom.xml
@@ -31,13 +31,75 @@
Compatibility module for HBase 1.4.0+
-1.4.0
+1.4.0
+
org.apache.hbase
hbase-server
+ ${hbase14.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-common
+ ${hbase14.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-annotations
+ ${hbase14.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics-api
+ ${hbase14.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics
+ ${hbase14.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-common
+ ${hbase14.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol
+ ${hbase14.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-client
+ ${hbase14.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-procedure
+ ${hbase14.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-hadoop-compat
+ ${hbase14.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-hadoop2-compat
+ ${hbase14.version}
provided
diff --git a/phoenix-hbase-compat-1.5.0/pom.xml
b/phoenix-hbase-compat-1.5.0/pom.xml
index 6234239..8864f5b 100644
--- a/phoenix-hbase-compat-1.5.0/pom.xml
+++ b/phoenix-hbase-compat-1.5.0/pom.xml
@@ -31,13 +31,75 @@
Compatibility module for HBase 1.5.0+
-1.5.0
+1.5.0
+
org.apache.hbase
hbase-server
+ ${hbase15.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-common
+ ${hbase15.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-annotations
+ ${hbase15.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics-api
+ ${hbase15.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics
+ ${hbase15.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-common
+ ${hbase15.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol
+ ${hbase15.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-client
+ ${hbase15.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-procedure
+ ${hbase15.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-hadoop-compat
+ ${hbase15.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-hadoop2-compat
+ ${hbase15.version}
provided
[phoenix] branch master updated: PHOENIX-6261 Reorganise project structure to make mvn versions:set work (addendum: fix regression with -Dhbase.version)
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 541246a PHOENIX-6261 Reorganise project structure to make mvn
versions:set work (addendum: fix regression with -Dhbase.version)
541246a is described below
commit 541246a673e6b89e589bd5247cff6e7c35ab071b
Author: Istvan Toth
AuthorDate: Thu Dec 24 07:08:40 2020 +0100
PHOENIX-6261 Reorganise project structure to make mvn versions:set work
(addendum: fix regression with -Dhbase.version)
---
phoenix-hbase-compat-2.1.6/pom.xml | 5 -
phoenix-hbase-compat-2.2.1/pom.xml | 5 -
phoenix-hbase-compat-2.3.0/pom.xml | 5 -
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/phoenix-hbase-compat-2.1.6/pom.xml
b/phoenix-hbase-compat-2.1.6/pom.xml
index 119c31b..0794dd5 100644
--- a/phoenix-hbase-compat-2.1.6/pom.xml
+++ b/phoenix-hbase-compat-2.1.6/pom.xml
@@ -32,7 +32,7 @@
Compatibility module for HBase 2.1.6+
-2.1.6
+2.1.6
@@ -40,16 +40,19 @@
org.apache.hbase
hbase-client
+ ${hbase21.compat.version}
provided
org.apache.hbase
hbase-common
+ ${hbase21.compat.version}
provided
org.apache.hbase
hbase-server
+ ${hbase21.compat.version}
provided
diff --git a/phoenix-hbase-compat-2.2.1/pom.xml
b/phoenix-hbase-compat-2.2.1/pom.xml
index d54cebf..34f8105 100644
--- a/phoenix-hbase-compat-2.2.1/pom.xml
+++ b/phoenix-hbase-compat-2.2.1/pom.xml
@@ -31,7 +31,7 @@
Compatibility module for HBase 2.2.1+
-2.2.1
+2.2.1
@@ -39,16 +39,19 @@
org.apache.hbase
hbase-client
+ ${hbase22.compat.version}
provided
org.apache.hbase
hbase-common
+ ${hbase22.compat.version}
provided
org.apache.hbase
hbase-server
+ ${hbase22.compat.version}
provided
diff --git a/phoenix-hbase-compat-2.3.0/pom.xml
b/phoenix-hbase-compat-2.3.0/pom.xml
index 7ea1827..4300624 100644
--- a/phoenix-hbase-compat-2.3.0/pom.xml
+++ b/phoenix-hbase-compat-2.3.0/pom.xml
@@ -31,7 +31,7 @@
Compatibility module for HBase 2.3.0+
-2.3.0
+2.3.0
@@ -39,16 +39,19 @@
org.apache.hbase
hbase-client
+${hbase23.compat.version}
provided
org.apache.hbase
hbase-common
+${hbase23.compat.version}
provided
org.apache.hbase
hbase-server
+${hbase23.compat.version}
provided
[phoenix] branch 4.x updated: PHOENIX-6274 : Deflake TableSnapshotReadsMapReduceIT.testMapReduceSnapshotsMultiRegion
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 07af4bf PHOENIX-6274 : Deflake
TableSnapshotReadsMapReduceIT.testMapReduceSnapshotsMultiRegion
07af4bf is described below
commit 07af4bf4e6df9dc92b4f942b492b835e3a1a9d61
Author: Viraj Jasani
AuthorDate: Sat Dec 19 17:34:26 2020 +0530
PHOENIX-6274 : Deflake
TableSnapshotReadsMapReduceIT.testMapReduceSnapshotsMultiRegion
---
.../end2end/TableSnapshotReadsMapReduceIT.java | 144 ++---
1 file changed, 123 insertions(+), 21 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java
index 930ff0b..db90014 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java
@@ -33,14 +33,18 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Random;
import java.util.UUID;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
+import org.apache.hadoop.hbase.master.AssignmentManager;
+import org.apache.hadoop.hbase.regionserver.HRegion;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos;
import org.apache.hadoop.io.NullWritable;
@@ -79,9 +83,9 @@ public class TableSnapshotReadsMapReduceIT extends
BaseUniqueNamesOwnClusterIT {
private static final String FIELD1 = "FIELD1";
private static final String FIELD2 = "FIELD2";
private static final String FIELD3 = "FIELD3";
- private String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS %s ( " +
+ private static final String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS %s (
" +
" FIELD1 VARCHAR NOT NULL , FIELD2 VARCHAR , FIELD3 INTEGER CONSTRAINT
pk PRIMARY KEY (FIELD1 ))";
- private String UPSERT = "UPSERT into %s values (?, ?, ?)";
+ private static final String UPSERT = "UPSERT into %s values (?, ?, ?)";
private static final String CREATE_STOCK_TABLE =
"CREATE TABLE IF NOT EXISTS %s ( " + STOCK_NAME + " VARCHAR NOT NULL
, " + RECORDING_YEAR
+ " INTEGER NOT NULL, " + RECORDINGS_QUARTER + " "
@@ -96,11 +100,13 @@ public class TableSnapshotReadsMapReduceIT extends
BaseUniqueNamesOwnClusterIT {
private Job job;
private Path tmpDir;
private Configuration conf;
+ private static final Random RANDOM = new Random();
@BeforeClass
public static synchronized void doSetup() throws Exception {
Map props = Maps.newHashMapWithExpectedSize(1);
setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
+ getUtility().getHBaseAdmin().setBalancerRunning(false, true);
}
@Before
@@ -270,7 +276,7 @@ public class TableSnapshotReadsMapReduceIT extends
BaseUniqueNamesOwnClusterIT {
assertFalse("Should only have stored" + result.size() + "rows in the
table for the timestamp!", rs.next());
} finally {
- deleteSnapshot(tableName);
+ deleteSnapshotIfExists(SNAPSHOT_NAME);
}
}
@@ -302,6 +308,26 @@ public class TableSnapshotReadsMapReduceIT extends
BaseUniqueNamesOwnClusterIT {
conn.commit();
}
+ private void upsertDataBeforeSplit(String tableName) throws SQLException {
+Connection conn = DriverManager.getConnection(getUrl());
+PreparedStatement stmt = conn.prepareStatement(String.format(UPSERT,
tableName));
+upsertData(stmt, "", "SSDD", RANDOM.nextInt());
+for (int i = 0; i < 100; i++) {
+ upsertData(stmt, "" + i, "JHHA" + i, RANDOM.nextInt());
+ upsertData(stmt, "" + i, "JHHB" + i, RANDOM.nextInt());
+ upsertData(stmt, "" + i, "JHHC" + i, RANDOM.nextInt());
+ upsertData(stmt, "" + i, "JSHJ" + i, RANDOM.nextInt());
+ upsertData(stmt, "1" + i, "JSHK" + i, RANDOM.nextInt());
+ upsertData(stmt, "2" + i, "JSHL" + i, RANDOM.nextInt());
+ upsertData(stmt, "1" + i, "SSDE" + i, RANDOM.nextInt());
+ upsertData(stmt, "2" + i, "SSDF" + i, RANDOM.nextInt());
+
[phoenix] branch master updated: PHOENIX-6274 : Deflake TableSnapshotReadsMapReduceIT.testMapReduceSnapshotsMultiRegion
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 1dcb749 PHOENIX-6274 : Deflake
TableSnapshotReadsMapReduceIT.testMapReduceSnapshotsMultiRegion
1dcb749 is described below
commit 1dcb74998589a9906973f208f7fc698814574639
Author: Viraj Jasani
AuthorDate: Sat Dec 19 17:34:26 2020 +0530
PHOENIX-6274 : Deflake
TableSnapshotReadsMapReduceIT.testMapReduceSnapshotsMultiRegion
---
.../end2end/TableSnapshotReadsMapReduceIT.java | 145 +
1 file changed, 123 insertions(+), 22 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java
index 2f2a188..e493b17 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TableSnapshotReadsMapReduceIT.java
@@ -33,15 +33,19 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Random;
import java.util.UUID;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.SnapshotDescription;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
+import org.apache.hadoop.hbase.master.assignment.AssignmentManager;
+import org.apache.hadoop.hbase.regionserver.HRegion;
+import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.io.Text;
@@ -79,9 +83,9 @@ public class TableSnapshotReadsMapReduceIT extends
BaseUniqueNamesOwnClusterIT {
private static final String FIELD1 = "FIELD1";
private static final String FIELD2 = "FIELD2";
private static final String FIELD3 = "FIELD3";
- private String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS %s ( " +
+ private static final String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS %s (
" +
" FIELD1 VARCHAR NOT NULL , FIELD2 VARCHAR , FIELD3 INTEGER CONSTRAINT
pk PRIMARY KEY (FIELD1 ))";
- private String UPSERT = "UPSERT into %s values (?, ?, ?)";
+ private static final String UPSERT = "UPSERT into %s values (?, ?, ?)";
private static final String CREATE_STOCK_TABLE =
"CREATE TABLE IF NOT EXISTS %s ( " + STOCK_NAME + " VARCHAR NOT NULL
, " + RECORDING_YEAR
+ " INTEGER NOT NULL, " + RECORDINGS_QUARTER + " "
@@ -96,11 +100,13 @@ public class TableSnapshotReadsMapReduceIT extends
BaseUniqueNamesOwnClusterIT {
private Job job;
private Path tmpDir;
private Configuration conf;
+ private static final Random RANDOM = new Random();
@BeforeClass
public static synchronized void doSetup() throws Exception {
Map props = Maps.newHashMapWithExpectedSize(1);
setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
+ getUtility().getAdmin().balancerSwitch(false, true);
}
@Before
@@ -268,7 +274,7 @@ public class TableSnapshotReadsMapReduceIT extends
BaseUniqueNamesOwnClusterIT {
assertFalse("Should only have stored" + result.size() + "rows in the
table for the timestamp!", rs.next());
} finally {
- deleteSnapshot(tableName);
+ deleteSnapshotIfExists(SNAPSHOT_NAME);
}
}
@@ -300,6 +306,26 @@ public class TableSnapshotReadsMapReduceIT extends
BaseUniqueNamesOwnClusterIT {
conn.commit();
}
+ private void upsertDataBeforeSplit(String tableName) throws SQLException {
+Connection conn = DriverManager.getConnection(getUrl());
+PreparedStatement stmt = conn.prepareStatement(String.format(UPSERT,
tableName));
+upsertData(stmt, "", "SSDD", RANDOM.nextInt());
+for (int i = 0; i < 100; i++) {
+ upsertData(stmt, "" + i, "JHHA" + i, RANDOM.nextInt());
+ upsertData(stmt, "" + i, "JHHB" + i, RANDOM.nextInt());
+ upsertData(stmt, "" + i, "JHHC" + i, RANDOM.nextInt());
+ upsertData(stmt, "" + i, "JSHJ" + i, RANDOM.nextInt());
+ upsertData(stmt, "1" + i, "JSHK" + i, RANDOM.nextInt());
+ upsertData(stmt, "2" + i, "JSHL" + i, RANDOM.nextInt());
+ upsertData(stmt, "1" + i, "SSDE" + i, RANDOM.nextInt());
+ upsertData(stmt, "2" + i, "SSDF
[phoenix-omid] branch master updated: OMID-188 Fix "inconsistent module metadata found" when using hbase-2
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 1b82bf6 OMID-188 Fix "inconsistent module metadata found" when using
hbase-2
1b82bf6 is described below
commit 1b82bf665e3ecf4c1503b2796af36a7799e74db1
Author: Chia-Ping Tsai
AuthorDate: Mon Nov 16 15:42:47 2020 +0800
OMID-188 Fix "inconsistent module metadata found" when using hbase-2
---
.gitignore | 1 +
benchmarks/pom.xml | 20 +---
codahale-metrics/pom.xml| 6 +++---
commit-table/pom.xml| 4 ++--
common/pom.xml | 4 ++--
examples/pom.xml| 16 +++-
hbase-client/pom.xml| 24
hbase-commit-table/pom.xml | 12 +++-
hbase-common/pom.xml| 2 +-
hbase-coprocessor/pom.xml | 22 +-
hbase-shims/hbase-1/pom.xml | 4 ++--
hbase-shims/hbase-2/pom.xml | 2 +-
hbase-shims/pom.xml | 4 ++--
hbase-tools/pom.xml | 22 +-
metrics/pom.xml | 4 ++--
pom.xml | 44 ++--
statemachine/pom.xml| 4 ++--
timestamp-storage/pom.xml | 10 ++
transaction-client/pom.xml | 14 +++---
tso-server/pom.xml | 38 ++
20 files changed, 80 insertions(+), 177 deletions(-)
diff --git a/.gitignore b/.gitignore
index c5d7a96..84db584 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
.project
.settings
.metadata
+.flattened-pom.xml
dependency-reduced-pom.xml
target/
lib/
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 8d7ea0a..de30dec 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -18,11 +18,11 @@
org.apache.omid
-omid
+omid-${hbase.artifactId.suffix}
1.0.3-SNAPSHOT
-omid-benchmarks
+omid-benchmarks-${hbase.artifactId.suffix}
Benchmarks
@@ -31,32 +31,22 @@
org.apache.omid
-omid-transaction-client
+
omid-transaction-client-${hbase.artifactId.suffix}
${project.version}
org.apache.omid
omid-hbase-commit-table-${hbase.artifactId.suffix}
${project.version}
-
-
-org.apache.omid
-${shims.exclude.artifactId}
-
-
-org.apache.omid
-
omid-hbase-common-${hbase.exclude.artifactId.suffix}
-
-
org.apache.omid
-omid-metrics
+omid-metrics-${hbase.artifactId.suffix}
${project.version}
org.apache.omid
-omid-codahale-metrics
+
omid-codahale-metrics-${hbase.artifactId.suffix}
${project.version}
diff --git a/codahale-metrics/pom.xml b/codahale-metrics/pom.xml
index 39b0076..64d5c0f 100644
--- a/codahale-metrics/pom.xml
+++ b/codahale-metrics/pom.xml
@@ -15,14 +15,14 @@
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;>
-omid
org.apache.omid
+omid-${hbase.artifactId.suffix}
1.0.3-SNAPSHOT
4.0.0
-omid-codahale-metrics
+omid-codahale-metrics-${hbase.artifactId.suffix}
Codahale Metrics
@@ -31,7 +31,7 @@
org.apache.omid
-omid-metrics
+omid-metrics-${hbase.artifactId.suffix}
${project.version}
diff --git a/commit-table/pom.xml b/commit-table/pom.xml
index 56240b0..e6496b5 100644
--- a/commit-table/pom.xml
+++ b/commit-table/pom.xml
@@ -18,11 +18,11 @@
org.apache.omid
-omid
+omid-${hbase.artifactId.suffix}
1.0.3-SNAPSHOT
-omid-commit-table
+omid-commit-table-${hbase.artifactId.suffix}
jar
Commit Table
diff --git a/common/pom.xml b/common/pom.xml
index f298850..e827729 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -18,11 +18,11 @@
org.apache.omid
-omid
+omid-${hbase.artifactId.suffix}
1.0.3-SNAPSHOT
-omid-common
+omid-common-${hbase.artifactId.suffix}
Common
jar
diff --git a/examples/pom.xml b/examples/pom.xml
index 2753dd0..b6445af 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -17,12 +17,12 @@
4.0.0
-omid
org.apache.omid
+omid-${hbase.artifactId.suffix}
1.0.3-SNAPSHOT
-
[phoenix] branch 4.x updated: PHOENIX-6269 : Extend ExplainPlan attributes based comparison to some tests
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 0d16fcf PHOENIX-6269 : Extend ExplainPlan attributes based comparison
to some tests
0d16fcf is described below
commit 0d16fcf1c62ee414374781e15368a6a9f2499e21
Author: Viraj Jasani
AuthorDate: Thu Dec 17 17:16:46 2020 +0530
PHOENIX-6269 : Extend ExplainPlan attributes based comparison to some tests
---
.../apache/phoenix/end2end/BaseAggregateIT.java| 86 +++---
.../org/apache/phoenix/end2end/BaseOrderByIT.java | 26 +--
.../end2end/BaseTenantSpecificViewIndexIT.java | 86 --
.../org/apache/phoenix/end2end/BaseViewIT.java | 85 +++--
.../CountDistinctApproximateHyperLogLogIT.java | 30 +---
.../apache/phoenix/end2end/IndexExtendedIT.java| 64 +++-
.../end2end/IndexToolForPartialBuildIT.java| 50 +++--
7 files changed, 298 insertions(+), 129 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java
index 5b466df..84a5d9e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java
@@ -21,7 +21,6 @@ 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.apache.phoenix.util.TestUtil.assertResultSet;
import java.io.IOException;
@@ -35,20 +34,16 @@ import java.util.List;
import java.util.Properties;
import com.google.common.collect.Lists;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.phoenix.compile.QueryPlan;
-import org.apache.phoenix.jdbc.PhoenixConnection;
-import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
-import org.apache.phoenix.jdbc.PhoenixStatement;
+import org.apache.phoenix.compile.ExplainPlan;
+import org.apache.phoenix.compile.ExplainPlanAttributes;
+import org.apache.phoenix.jdbc.PhoenixPreparedStatement;
import org.apache.phoenix.query.KeyRange;
import org.apache.phoenix.query.QueryServices;
-import org.apache.phoenix.schema.AmbiguousColumnException;
import org.apache.phoenix.schema.types.PChar;
import org.apache.phoenix.schema.types.PInteger;
import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryBuilder;
-import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
@@ -375,12 +370,22 @@ public abstract class BaseAggregateIT extends
ParallelStatsDisabledIT {
assertEquals("abc", rs.getString(2));
assertFalse(rs.next());
-String expectedPhoenixPlan = "CLIENT PARALLEL 1-WAY RANGE SCAN OVER "
+ tableName
-+ " ['012','345',0,*] -
['012','345',0,1]\n" +
-"SERVER FILTER BY FIRST KEY ONLY\n" +
-"SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY
[MATCH_STATUS, EXTERNAL_DATASOURCE_KEY]\n" +
-"CLIENT FILTER BY COUNT(1) > 1";
-validateQueryPlan(conn, queryBuilder, expectedPhoenixPlan, null);
+ExplainPlan plan = conn.prepareStatement(queryBuilder.build())
+.unwrap(PhoenixPreparedStatement.class).optimizeQuery()
+.getExplainPlan();
+ExplainPlanAttributes explainPlanAttributes =
+plan.getPlanStepsAsAttributes();
+assertEquals("PARALLEL 1-WAY",
+explainPlanAttributes.getIteratorTypeAndScanSize());
+assertEquals("RANGE SCAN ",
explainPlanAttributes.getExplainScanType());
+assertEquals(tableName, explainPlanAttributes.getTableName());
+assertEquals(" ['012','345',0,*] -
['012','345',0,1]",
+explainPlanAttributes.getKeyRanges());
+assertEquals("SERVER FILTER BY FIRST KEY ONLY",
+explainPlanAttributes.getServerWhereFilter());
+assertEquals("SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY
[MATCH_STATUS, EXTERNAL_DATASOURCE_KEY]",
+explainPlanAttributes.getServerAggregate());
+assertEquals("COUNT(1) > 1",
explainPlanAttributes.getClientFilterBy());
}
@Test
@@ -420,10 +425,20 @@ public abstract class BaseAggregateIT extends
ParallelStatsDisabledIT {
assertEquals("a", rs.getString(1));
assertEquals(4, rs.getLong(2));
assertFalse(rs.next());
-
[phoenix] branch master updated: PHOENIX-6269 : Extend ExplainPlan attributes based comparison to some tests
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 3d9627f PHOENIX-6269 : Extend ExplainPlan attributes based comparison
to some tests
3d9627f is described below
commit 3d9627fb142b9e1960f4a8bada6ed5a1c6d6537b
Author: Viraj Jasani
AuthorDate: Thu Dec 17 17:16:46 2020 +0530
PHOENIX-6269 : Extend ExplainPlan attributes based comparison to some tests
---
.../apache/phoenix/end2end/BaseAggregateIT.java| 86 +++---
.../org/apache/phoenix/end2end/BaseOrderByIT.java | 26 +--
.../end2end/BaseTenantSpecificViewIndexIT.java | 86 --
.../org/apache/phoenix/end2end/BaseViewIT.java | 85 +++--
.../CountDistinctApproximateHyperLogLogIT.java | 30 +---
.../apache/phoenix/end2end/IndexExtendedIT.java| 63 +++-
.../end2end/IndexToolForPartialBuildIT.java| 50 +++--
7 files changed, 298 insertions(+), 128 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java
index d1d6752..5b83e39 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateIT.java
@@ -21,7 +21,6 @@ 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.apache.phoenix.util.TestUtil.assertResultSet;
import java.io.IOException;
@@ -34,21 +33,17 @@ import java.sql.Statement;
import java.util.List;
import java.util.Properties;
+import org.apache.phoenix.compile.ExplainPlan;
+import org.apache.phoenix.compile.ExplainPlanAttributes;
+import org.apache.phoenix.jdbc.PhoenixPreparedStatement;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.phoenix.compile.QueryPlan;
-import org.apache.phoenix.jdbc.PhoenixConnection;
-import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
-import org.apache.phoenix.jdbc.PhoenixStatement;
import org.apache.phoenix.query.KeyRange;
import org.apache.phoenix.query.QueryServices;
-import org.apache.phoenix.schema.AmbiguousColumnException;
import org.apache.phoenix.schema.types.PChar;
import org.apache.phoenix.schema.types.PInteger;
import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.QueryBuilder;
-import org.apache.phoenix.util.QueryUtil;
import org.apache.phoenix.util.TestUtil;
import org.junit.Test;
@@ -375,12 +370,22 @@ public abstract class BaseAggregateIT extends
ParallelStatsDisabledIT {
assertEquals("abc", rs.getString(2));
assertFalse(rs.next());
-String expectedPhoenixPlan = "CLIENT PARALLEL 1-WAY RANGE SCAN OVER "
+ tableName
-+ " ['012','345',0,*] -
['012','345',0,1]\n" +
-"SERVER FILTER BY FIRST KEY ONLY\n" +
-"SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY
[MATCH_STATUS, EXTERNAL_DATASOURCE_KEY]\n" +
-"CLIENT FILTER BY COUNT(1) > 1";
-validateQueryPlan(conn, queryBuilder, expectedPhoenixPlan, null);
+ExplainPlan plan = conn.prepareStatement(queryBuilder.build())
+.unwrap(PhoenixPreparedStatement.class).optimizeQuery()
+.getExplainPlan();
+ExplainPlanAttributes explainPlanAttributes =
+plan.getPlanStepsAsAttributes();
+assertEquals("PARALLEL 1-WAY",
+explainPlanAttributes.getIteratorTypeAndScanSize());
+assertEquals("RANGE SCAN ",
explainPlanAttributes.getExplainScanType());
+assertEquals(tableName, explainPlanAttributes.getTableName());
+assertEquals(" ['012','345',0,*] -
['012','345',0,1]",
+explainPlanAttributes.getKeyRanges());
+assertEquals("SERVER FILTER BY FIRST KEY ONLY",
+explainPlanAttributes.getServerWhereFilter());
+assertEquals("SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY
[MATCH_STATUS, EXTERNAL_DATASOURCE_KEY]",
+explainPlanAttributes.getServerAggregate());
+assertEquals("COUNT(1) > 1",
explainPlanAttributes.getClientFilterBy());
}
@Test
@@ -420,10 +425,20 @@ public abstract class BaseAggregateIT extends
ParallelStatsDisabledIT {
assertEquals("a", rs.getString(1));
assertE
[phoenix] branch 4.x updated: PHOENIX-6261 Reorganise project structure to make mvn versions:set work
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 aa468e3 PHOENIX-6261 Reorganise project structure to make mvn
versions:set work
aa468e3 is described below
commit aa468e3ad6ab869bd0c646867c12c0603392eb7f
Author: Istvan Toth
AuthorDate: Fri Dec 11 11:20:57 2020 +0100
PHOENIX-6261 Reorganise project structure to make mvn versions:set work
---
phoenix-core/pom.xml | 47 +++
phoenix-hbase-compat-1.3.0/pom.xml | 44 +
phoenix-hbase-compat-1.4.0/pom.xml | 44 +
phoenix-hbase-compat-1.5.0/pom.xml | 45 +-
pom.xml| 79 +-
5 files changed, 75 insertions(+), 184 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 809f745..de08a2d 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -34,6 +34,48 @@
+org.apache.maven.plugins
+maven-enforcer-plugin
+${maven-enforcer-plugin.version}
+
+
+check-hbase-compatibility
+validate
+
+ enforce
+
+
+
+
+
+
+ import java.util.regex.Pattern;
+ import java.lang.Integer;
+
+ versionPattern =
Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)[^.]*$");
+ versionMatcher = versionPattern.matcher("${hbase.version}");
+ versionMatcher.find();
+
+ hbaseMajor = Integer.parseInt(versionMatcher.group(1));
+ hbaseMinor = Integer.parseInt(versionMatcher.group(2));
+ hbasePatch = Integer.parseInt(versionMatcher.group(3));
+
+ hbaseMajor == 1 (
+ ("${hbase.compat.version}".equals("1.5.0")
+(hbaseMinor == 5 || hbaseMinor == 6))
+ || ("${hbase.compat.version}".equals("1.4.0")
+hbaseMinor == 4)
+ || ("${hbase.compat.version}".equals("1.3.0")
+hbaseMinor == 3)
+ )
+
+
+
+
+
+
+
+
org.codehaus.mojo
build-helper-maven-plugin
@@ -147,6 +189,11 @@
+
+
+org.apache.phoenix
+phoenix-hbase-compat-${hbase.compat.version}
+
org.apache.omid
omid-hbase-client-hbase1.x
diff --git a/phoenix-hbase-compat-1.3.0/pom.xml
b/phoenix-hbase-compat-1.3.0/pom.xml
index 7f86378..1725cd6 100644
--- a/phoenix-hbase-compat-1.3.0/pom.xml
+++ b/phoenix-hbase-compat-1.3.0/pom.xml
@@ -17,53 +17,27 @@
-->
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;>
+ 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
-apache
-21
+phoenix
+org.apache.phoenix
+4.16.0-SNAPSHOT
- org.apache.phoenix
+
phoenix-hbase-compat-1.3.0
- 4.16.0-SNAPSHOT
Phoenix Hbase 1.3.0 compatibility
Compatibility module for HBase 1.3.0+
-
-
-
-
-org.apache.maven.plugins
-maven-eclipse-plugin
-2.9
-
-
-org.eclipse.jdt.core.javabuilder
-
-
-
-
-org.apache.maven.plugins
-maven-compiler-plugin
-
- 1.7
- 1.7
-
-
-
-org.apache.rat
-apache-rat-plugin
-
-
-
+
+1.3.0
+
org.apache.hbase
hbase-server
- 1.3.0
provided
diff --git a/phoenix-hbase-compat-1.4.0/pom.xml
b/phoenix-hbase-compat-1.4.0/pom.xml
index 0faebdb..a4c3b59 100644
--- a/phoenix-hbase-compat-1.4.0/pom.xml
+++ b/phoenix-hbase-compat-1.4.0/pom.xml
@@ -17,53 +17,27 @@
-->
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;>
+ 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
-apache
-21
+phoenix
+org.apache.phoenix
+4.16.0-SNAPSHOT
- org.apache.phoenix
+
phoenix-hbase-compat-1.4.0
- 4.16.0-SNAPSHOT
Phoenix Hbase 1.4.0 compatibility
Compatibility
[phoenix] branch master updated: PHOENIX-6261 Reorganise project structure to make mvn versions:set work
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 6e019dd PHOENIX-6261 Reorganise project structure to make mvn
versions:set work
6e019dd is described below
commit 6e019dd50c03c884308494e6c888be427f272b26
Author: Istvan Toth
AuthorDate: Fri Dec 11 10:45:41 2020 +0100
PHOENIX-6261 Reorganise project structure to make mvn versions:set work
---
phoenix-core/pom.xml | 47 +
phoenix-hbase-compat-2.1.6/pom.xml | 70 ++
phoenix-hbase-compat-2.2.1/pom.xml | 68 +---
phoenix-hbase-compat-2.3.0/pom.xml | 36 +---
pom.xml| 48 --
5 files changed, 105 insertions(+), 164 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index b7762ea..a6e60c3 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -38,6 +38,53 @@
org.apache.maven.plugins
maven-site-plugin
+
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ ${maven-enforcer-plugin.version}
+
+
+
+
+ import java.util.regex.Pattern;
+ import java.lang.Integer;
+
+ versionPattern =
Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)[^.]*$");
+ versionMatcher = versionPattern.matcher("${hbase.version}");
+ versionMatcher.find();
+
+ hbaseMajor = Integer.parseInt(versionMatcher.group(1));
+ hbaseMinor = Integer.parseInt(versionMatcher.group(2));
+ hbasePatch = Integer.parseInt(versionMatcher.group(3));
+
+ hbaseMajor == 2 (
+("${hbase.compat.version}".equals("2.1.6")
+ hbaseMinor == 1
+ hbasePatch =6)
+|| ("${hbase.compat.version}".equals("2.2.1")
+ hbaseMinor == 2
+ hbasePatch =1)
+|| ("${hbase.compat.version}".equals("2.3.0")
+ hbaseMinor == 3
+ hbasePatch =0)
+ )
+
+
+
+
+
+
+ check-hbase-compatibility
+ validate
+
+ enforce
+
+
+
+
org.codehaus.mojo
build-helper-maven-plugin
diff --git a/phoenix-hbase-compat-2.1.6/pom.xml
b/phoenix-hbase-compat-2.1.6/pom.xml
index e5a8d0d..119c31b 100644
--- a/phoenix-hbase-compat-2.1.6/pom.xml
+++ b/phoenix-hbase-compat-2.1.6/pom.xml
@@ -20,57 +20,39 @@
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
-apache
-21
+
+org.apache.phoenix
+phoenix
+5.1.0-SNAPSHOT
- org.apache.phoenix
+
phoenix-hbase-compat-2.1.6
- 5.1.0-SNAPSHOT
+
Phoenix Hbase 2.1.6 compatibility
Compatibility module for HBase 2.1.6+
-
-
-
-
-org.apache.maven.plugins
-maven-eclipse-plugin
-2.9
-
-
-org.eclipse.jdt.core.javabuilder
-
-
-
-
-org.apache.rat
-apache-rat-plugin
-
-
-
+
+2.1.6
+
-
-
-org.apache.hbase
-hbase-client
-2.1.6
-provided
-
-
-org.apache.hbase
-hbase-common
-2.1.6
-provided
-
-
-org.apache.hbase
-hbase-server
-2.1.6
-provided
-
+
+
+ org.apache.hbase
+ hbase-client
+ provided
+
+
+ org.apache.hbase
+ hbase-common
+ provided
+
+
+ org.apache.hbase
+ hbase-server
+ provided
+
+
diff --git a/phoenix-hbase-compat-2.2.1/pom.xml
b/phoenix-hbase-compat-2.2.1/pom.xml
index efb3160..d54cebf 100644
--- a/phoenix-hbase-compat-2.2.1/pom.xml
+++ b/phoenix-hbase-compat-2.2.1/pom.xml
@@ -20,57 +20,37 @@
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
-apache
-21
+
+org.apache.phoenix
+phoenix
+5.1.0-SNAPSHOT
- org.apache.phoenix
+
phoenix-hbase-compat-2.2.1
- 5.1.0-SNAPSHOT
Phoenix Hbase 2.2.1 compatibility
Compatibility module for HBase 2.2.1+
-
-
-
-
-org.apache.maven.plugins
-maven-eclipse-plugin
-2.9
-
-
-org.eclipse.jdt.core.java
[phoenix-connectors] branch master updated: PHOENIX-6261 Reorganise project structure to make mvn versions:set work
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 aff86a2 PHOENIX-6261 Reorganise project structure to make mvn
versions:set work
aff86a2 is described below
commit aff86a2e0846cb69e83ea1d6d441a6c2f21354aa
Author: Richard Antal
AuthorDate: Fri Dec 11 10:14:54 2020 +0100
PHOENIX-6261 Reorganise project structure to make mvn versions:set work
---
phoenix-connectors-phoenix4-compat/pom.xml | 14 +++---
phoenix-connectors-phoenix5-compat/pom.xml | 8 +++-
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/phoenix-connectors-phoenix4-compat/pom.xml
b/phoenix-connectors-phoenix4-compat/pom.xml
index de1dbdc..c5e3443 100644
--- a/phoenix-connectors-phoenix4-compat/pom.xml
+++ b/phoenix-connectors-phoenix4-compat/pom.xml
@@ -23,14 +23,12 @@
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;>
-org.apache
-apache
-23
+org.apache.phoenix
+phoenix-connectors
+6.0.0-SNAPSHOT
4.0.0
- 6.0.0-SNAPSHOT
- org.apache.phoenix
phoenix-connectors-phoenix4-compat
Compatibility util for Phoenix 4
@@ -49,12 +47,6 @@
org.apache.hbase
- hbase-common
- ${hbase.version}
- provided
-
-
- org.apache.hbase
hbase-server
${hbase.version}
diff --git a/phoenix-connectors-phoenix5-compat/pom.xml
b/phoenix-connectors-phoenix5-compat/pom.xml
index 4910b82..781338a 100644
--- a/phoenix-connectors-phoenix5-compat/pom.xml
+++ b/phoenix-connectors-phoenix5-compat/pom.xml
@@ -23,14 +23,12 @@
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;>
-org.apache
-apache
-23
+org.apache.phoenix
+phoenix-connectors
+6.0.0-SNAPSHOT
4.0.0
- 6.0.0-SNAPSHOT
- org.apache.phoenix
phoenix-connectors-phoenix5-compat
Compatibility util for Phoenix 5
[phoenix] branch master updated: PHOENIX-6260 Omid exclusions are incomplete
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 e6d70be PHOENIX-6260 Omid exclusions are incomplete e6d70be is described below commit e6d70be99ba97a7bbd6a8f02cddf58bb284188bd Author: Istvan Toth AuthorDate: Thu Dec 10 09:10:23 2020 +0100 PHOENIX-6260 Omid exclusions are incomplete --- pom.xml | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 19ac080..dc116e1 100644 --- a/pom.xml +++ b/pom.xml @@ -989,7 +989,11 @@ 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 @@ -1001,7 +1005,7 @@ org.testng testng - +
[phoenix-connectors] branch master updated: PHOENIX-6249 Create shaded phoenix-spark connector 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-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new 22fe0ce PHOENIX-6249 Create shaded phoenix-spark connector jar
22fe0ce is described below
commit 22fe0ce9b5b618a7ac31a9fc1ac8266f8ff21aac
Author: Istvan Toth
AuthorDate: Mon Dec 7 13:00:35 2020 +0100
PHOENIX-6249 Create shaded phoenix-spark connector jar
---
phoenix-spark-base/phoenix4-spark/pom.xml | 4 +
phoenix-spark-base/phoenix5-spark/pom.xml | 20 +-
phoenix-spark-base/pom.xml | 264 -
phoenix4-connectors-assembly/pom.xml | 2 +-
.../src/build/components/phoenix4-jars.xml | 2 +-
phoenix5-connectors-assembly/pom.xml | 2 +-
.../src/build/components/phoenix5-jars.xml | 2 +-
pom.xml| 16 +-
8 files changed, 297 insertions(+), 15 deletions(-)
diff --git a/phoenix-spark-base/phoenix4-spark/pom.xml
b/phoenix-spark-base/phoenix4-spark/pom.xml
index 53bbfde..903c75f 100644
--- a/phoenix-spark-base/phoenix4-spark/pom.xml
+++ b/phoenix-spark-base/phoenix4-spark/pom.xml
@@ -61,6 +61,10 @@
org.apache.maven.plugins
maven-failsafe-plugin
+
+org.apache.maven.plugins
+maven-shade-plugin
+
diff --git a/phoenix-spark-base/phoenix5-spark/pom.xml
b/phoenix-spark-base/phoenix5-spark/pom.xml
index 3fd1a9e..3a9105f 100644
--- a/phoenix-spark-base/phoenix5-spark/pom.xml
+++ b/phoenix-spark-base/phoenix5-spark/pom.xml
@@ -39,7 +39,6 @@
${hadoop-three.version}
1.8
2.10.0
-1.9.13
5
@@ -48,6 +47,21 @@
org.apache.phoenix
phoenix-connectors-phoenix5-compat
+
+ org.apache.hadoop
+ hadoop-hdfs-client
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+ provided
+
@@ -90,6 +104,10 @@
org.apache.maven.plugins
maven-failsafe-plugin
+
+org.apache.maven.plugins
+maven-shade-plugin
+
diff --git a/phoenix-spark-base/pom.xml b/phoenix-spark-base/pom.xml
index fe01511..00fe45c 100644
--- a/phoenix-spark-base/pom.xml
+++ b/phoenix-spark-base/pom.xml
@@ -144,6 +144,7 @@
netty
+ provided
@@ -175,6 +176,7 @@
netty
+ provided
@@ -379,6 +381,53 @@
test
+
+
+ org.apache.hadoop
+ hadoop-annotations
+ provided
+
+
+ org.apache.hadoop
+ hadoop-auth
+ provided
+
+
+ org.apache.hadoop
+ hadoop-yarn-api
+ provided
+
+
+ org.apache.hadoop
+ hadoop-hdfs
+ provided
+
+
+ org.apache.hadoop
+ hadoop-distcp
+ provided
+
+
+ org.apache.hadoop
+ hadoop-client
+ provided
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-jobclient
+ provided
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-common
+ provided
+
+
+
+ org.slf4j
+ slf4j-log4j12
+ provided
+
@@ -461,6 +510,7 @@
maven-dependency-plugin
+true
@@ -546,7 +596,6 @@
1.8
-
org.apache.maven.plugins
maven-jar-plugin
@@ -564,6 +613,219 @@
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+
+
phoenix${phoenix.main.version}-${project.version}-spark
+true
+
+
+*:*
+
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+ META-INF/license/*
+ META-INF/NOTICE
+ LICENSE.*
+ NOTICE.*
+ NOTICE
+ README*
+
+
+
+org.apache.hadoop:hadoop-yarn-common
+
+
org/apache/hadoop/yarn/factories/package-info.class
+
org/apache/hadoop/yarn/util/package-info.class
+
org/apache/hadoop/yarn/factory/providers/package-info.class
+
org/apache/hadoop/yarn/client/api/impl/package-info.class
+
org/apache/hadoop/yarn/client/api/package-info.class
+ webapps/**
+
+
+
+
+org.apache.commons:commons-math3
[phoenix-connectors] branch master updated: PHOENIX-5787 Do not package hive dependencies into phoenix-hive 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-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new 38bcd9a PHOENIX-5787 Do not package hive dependencies into
phoenix-hive jar
38bcd9a is described below
commit 38bcd9aba2110de5ac7aeaf668226a827ea45c97
Author: Istvan Toth
AuthorDate: Thu Dec 3 06:31:54 2020 +0100
PHOENIX-5787 Do not package hive dependencies into phoenix-hive jar
---
.github/workflows/maven.yml| 2 +-
phoenix-hive-base/phoenix4-hive/pom.xml| 42 ++-
phoenix-hive-base/phoenix5-hive/pom.xml| 70 +++-
phoenix-hive-base/pom.xml | 392 -
.../org/apache/phoenix/hive/PhoenixMetaHook.java | 2 +
.../phoenix/hive/util/PhoenixConnectionUtil.java | 2 +-
phoenix5-connectors-assembly/pom.xml | 7 +
pom.xml| 152 +---
8 files changed, 524 insertions(+), 145 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 5839864..dc8259e 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -33,4 +33,4 @@ jobs:
# The build doesn't seem to pick up the result of the install from above,
so just re-compile
# and the Maven reactor will find it just fine.
- name: Test
- run: mvn -B verify
+ run: mvn -B clean verify
diff --git a/phoenix-hive-base/phoenix4-hive/pom.xml
b/phoenix-hive-base/phoenix4-hive/pom.xml
index dc09e3b..97f2479 100644
--- a/phoenix-hive-base/phoenix4-hive/pom.xml
+++ b/phoenix-hive-base/phoenix4-hive/pom.xml
@@ -35,12 +35,52 @@
${hive2.version}
${hive2-storage.version}
+2.6.2
org.apache.phoenix
phoenix-connectors-phoenix4-compat
+
+
+
+ org.apache.hive
+ hive-cli
+ ${hive.version}
+ provided
+
+
+ org.apache.hive
+ hive-common
+ ${hive.version}
+ provided
+
+
+ org.apache.hive
+ hive-exec
+ ${hive.version}
+ provided
+
+
+
+ org.apache.hive
+ hive-serde
+ ${hive.version}
+ provided
+
+
+ org.apache.hive
+ hive-storage-api
+ ${hive-storage.version}
+ provided
+
+
+ org.apache.hive.shims
+ hive-shims-common
+ ${hive.version}
+ provided
@@ -71,7 +111,7 @@
org.apache.maven.plugins
-maven-assembly-plugin
+maven-shade-plugin
diff --git a/phoenix-hive-base/phoenix5-hive/pom.xml
b/phoenix-hive-base/phoenix5-hive/pom.xml
index 22566e9..e9bede2 100644
--- a/phoenix-hive-base/phoenix5-hive/pom.xml
+++ b/phoenix-hive-base/phoenix5-hive/pom.xml
@@ -47,6 +47,52 @@
org.apache.phoenix
phoenix-connectors-phoenix5-compat
+
+
+ org.apache.hive
+ hive-cli
+ ${hive.version}
+ provided
+
+
+ org.apache.hive
+ hive-common
+ ${hive.version}
+ provided
+
+
+ org.apache.hive
+ hive-exec
+ ${hive.version}
+ provided
+
+
+
+ org.apache.hive
+ hive-serde
+ ${hive.version}
+
+
+
+ io.netty
+ *
+
+
+ provided
+
+
+ org.apache.hive
+ hive-storage-api
+ ${hive-storage.version}
+ provided
+
+
+ org.apache.hive.shims
+ hive-shims-common
+ ${hive.version}
+ provided
+
org.apache.hive
@@ -57,21 +103,37 @@
org.apache.hbase
hbase-mapreduce
- ${hbase.version}
+ provided
org.apache.hbase
hbase-zookeeper
- ${hbase.version}
+ provided
org.apache.hadoop
hadoop-mapreduce-client-core
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol-shaded
+ provided
+
+
+ org.apache.hbase
+ hbase-endpoint
+ provided
+
+
+ org.apache.hadoop
+ hadoop-hdfs-client
+ provided
org.apache.logging.log4j
log4j-core
- 2.14.0
+ ${log4j2.version}
test
@@ -96,7 +158,7 @@
org.apache.maven.plugins
-maven-assembly-plugin
+maven-shade-plugin
diff --git a/phoenix-hive-base/pom.xml b/phoenix-hive-base/pom.xml
index 9ca011c..5120a07 100644
--- a/phoenix-hive-base/pom.xml
+++ b/phoenix-hive-base/pom.xml
@@ -33,6 +33,7 @@
Phoenix Hive Connector - Base
pom
+
phoenix4-hive
phoenix5-hive
@@ -64,63 +65,36 @@
commons-lang3
${commons-lang3.version}
-
- org.apache.hive
- hive-cli
- ${hive.version}
- provided
-
-
- org.apache.hive
- hive
[phoenix] branch 4.x updated: PHOENIX-5728 : ExplainPlan with plan as attributes object
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 e281ec6 PHOENIX-5728 : ExplainPlan with plan as attributes object
e281ec6 is described below
commit e281ec67e49b1dc8b924a7faa5f6fc8529bce1b3
Author: Viraj Jasani
AuthorDate: Mon Nov 30 23:02:12 2020 +0530
PHOENIX-5728 : ExplainPlan with plan as attributes object
---
.../apache/phoenix/iterate/MockResultIterator.java | 7 +
.../phoenix/schema/stats/BaseStatsCollectorIT.java | 129 +++--
.../org/apache/phoenix/compile/DeleteCompiler.java | 25 +-
.../org/apache/phoenix/compile/ExplainPlan.java| 19 +-
.../phoenix/compile/ExplainPlanAttributes.java | 598 +
.../apache/phoenix/compile/GroupByCompiler.java| 51 +-
.../apache/phoenix/compile/ListJarsQueryPlan.java | 7 +
.../compile/MutatingParallelIteratorFactory.java | 7 +
.../org/apache/phoenix/compile/TraceQueryPlan.java | 7 +
.../org/apache/phoenix/compile/UpsertCompiler.java | 28 +-
.../org/apache/phoenix/execute/BaseQueryPlan.java | 18 +-
.../phoenix/execute/ClientAggregatePlan.java | 34 +-
.../org/apache/phoenix/execute/ClientScanPlan.java | 23 +-
.../org/apache/phoenix/execute/CorrelatePlan.java | 37 +-
.../org/apache/phoenix/execute/HashJoinPlan.java | 1 +
.../execute/LiteralResultIterationPlan.java| 9 +-
.../apache/phoenix/execute/SortMergeJoinPlan.java | 44 +-
.../phoenix/execute/TupleProjectionPlan.java | 14 +-
.../java/org/apache/phoenix/execute/UnionPlan.java | 12 +-
.../apache/phoenix/execute/UnnestArrayPlan.java| 13 +-
.../BaseGroupedAggregatingResultIterator.java | 7 +
.../apache/phoenix/iterate/BaseResultIterator.java | 7 +
.../phoenix/iterate/BaseResultIterators.java | 67 ++-
.../phoenix/iterate/ChunkedResultIterator.java | 14 +
.../ClientHashAggregatingResultIterator.java | 8 +
.../phoenix/iterate/ConcatResultIterator.java | 10 +
.../phoenix/iterate/CursorResultIterator.java | 10 +
.../phoenix/iterate/DelegateResultIterator.java| 8 +
.../iterate/DistinctAggregatingResultIterator.java | 11 +
.../org/apache/phoenix/iterate/ExplainTable.java | 91 +++-
.../iterate/FilterAggregatingResultIterator.java | 20 +-
.../phoenix/iterate/FilterResultIterator.java | 20 +-
.../phoenix/iterate/LimitingResultIterator.java| 22 +-
.../phoenix/iterate/LookAheadResultIterator.java | 8 +
.../MaterializedComparableResultIterator.java | 8 +
.../iterate/MaterializedResultIterator.java| 7 +
.../iterate/MergeSortRowKeyResultIterator.java | 20 +-
.../iterate/MergeSortTopNResultIterator.java | 30 +-
.../phoenix/iterate/OffsetResultIterator.java | 10 +
.../phoenix/iterate/OrderedResultIterator.java | 20 +
.../phoenix/iterate/PeekingResultIterator.java | 7 +
.../org/apache/phoenix/iterate/ResultIterator.java | 24 +
.../apache/phoenix/iterate/ResultIterators.java| 20 +
.../phoenix/iterate/RoundRobinResultIterator.java | 16 +
.../RowKeyOrderedAggregateResultIterator.java | 10 +
.../phoenix/iterate/ScanningResultIterator.java| 7 +
.../phoenix/iterate/SequenceResultIterator.java| 22 +-
.../apache/phoenix/iterate/SerialIterators.java| 7 +
.../phoenix/iterate/SpoolingResultIterator.java| 17 +
.../phoenix/iterate/TableResultIterator.java | 8 +
.../iterate/TableSnapshotResultIterator.java | 15 +-
.../phoenix/iterate/UnionResultIterators.java | 30 +-
.../phoenix/iterate/ConcatResultIteratorTest.java | 8 +
.../iterate/MaterializedResultIterators.java | 7 +
.../iterate/MergeSortResultIteratorTest.java | 17 +
55 files changed, 1552 insertions(+), 144 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/MockResultIterator.java
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/MockResultIterator.java
index e842317..5b5b643 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/MockResultIterator.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/MockResultIterator.java
@@ -28,6 +28,8 @@ import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.phoenix.compile.ExplainPlanAttributes
+.ExplainPlanAttributesBuilder;
import org.apache.phoenix.execute.TupleProjector;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.schema.tuple.ResultTuple;
@@ -56,6 +58,11 @@ public class MockResultIterator implements
PeekingResultIterator {
public void explain(List planSteps) {}
@Override
+public void explain(List planSteps,
+ExplainPlanAttributesBuilder explainPlanAttributesBuilder
[phoenix] branch master updated: PHOENIX-5728 : ExplainPlan with plan as attributes object
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 0106d96 PHOENIX-5728 : ExplainPlan with plan as attributes object
0106d96 is described below
commit 0106d96326380e70c6ab895a79ccfac5eafece89
Author: Viraj Jasani
AuthorDate: Mon Nov 30 23:02:12 2020 +0530
PHOENIX-5728 : ExplainPlan with plan as attributes object
---
.../apache/phoenix/iterate/MockResultIterator.java | 7 +
.../phoenix/schema/stats/BaseStatsCollectorIT.java | 129 +++--
.../org/apache/phoenix/compile/DeleteCompiler.java | 25 +-
.../org/apache/phoenix/compile/ExplainPlan.java| 19 +-
.../phoenix/compile/ExplainPlanAttributes.java | 598 +
.../apache/phoenix/compile/GroupByCompiler.java| 51 +-
.../apache/phoenix/compile/ListJarsQueryPlan.java | 7 +
.../compile/MutatingParallelIteratorFactory.java | 7 +
.../org/apache/phoenix/compile/TraceQueryPlan.java | 7 +
.../org/apache/phoenix/compile/UpsertCompiler.java | 28 +-
.../org/apache/phoenix/execute/BaseQueryPlan.java | 18 +-
.../phoenix/execute/ClientAggregatePlan.java | 34 +-
.../org/apache/phoenix/execute/ClientScanPlan.java | 23 +-
.../org/apache/phoenix/execute/CorrelatePlan.java | 37 +-
.../org/apache/phoenix/execute/HashJoinPlan.java | 1 +
.../execute/LiteralResultIterationPlan.java| 9 +-
.../apache/phoenix/execute/SortMergeJoinPlan.java | 44 +-
.../phoenix/execute/TupleProjectionPlan.java | 14 +-
.../java/org/apache/phoenix/execute/UnionPlan.java | 12 +-
.../apache/phoenix/execute/UnnestArrayPlan.java| 13 +-
.../BaseGroupedAggregatingResultIterator.java | 7 +
.../apache/phoenix/iterate/BaseResultIterator.java | 7 +
.../phoenix/iterate/BaseResultIterators.java | 67 ++-
.../phoenix/iterate/ChunkedResultIterator.java | 14 +
.../ClientHashAggregatingResultIterator.java | 8 +
.../phoenix/iterate/ConcatResultIterator.java | 10 +
.../phoenix/iterate/CursorResultIterator.java | 10 +
.../phoenix/iterate/DelegateResultIterator.java| 8 +
.../iterate/DistinctAggregatingResultIterator.java | 11 +
.../org/apache/phoenix/iterate/ExplainTable.java | 91 +++-
.../iterate/FilterAggregatingResultIterator.java | 20 +-
.../phoenix/iterate/FilterResultIterator.java | 20 +-
.../phoenix/iterate/LimitingResultIterator.java| 22 +-
.../phoenix/iterate/LookAheadResultIterator.java | 8 +
.../MaterializedComparableResultIterator.java | 8 +
.../iterate/MaterializedResultIterator.java| 7 +
.../iterate/MergeSortRowKeyResultIterator.java | 20 +-
.../iterate/MergeSortTopNResultIterator.java | 30 +-
.../phoenix/iterate/OffsetResultIterator.java | 10 +
.../phoenix/iterate/OrderedResultIterator.java | 20 +
.../phoenix/iterate/PeekingResultIterator.java | 7 +
.../org/apache/phoenix/iterate/ResultIterator.java | 24 +
.../apache/phoenix/iterate/ResultIterators.java| 20 +
.../phoenix/iterate/RoundRobinResultIterator.java | 16 +
.../RowKeyOrderedAggregateResultIterator.java | 10 +
.../phoenix/iterate/ScanningResultIterator.java| 7 +
.../phoenix/iterate/SequenceResultIterator.java| 22 +-
.../apache/phoenix/iterate/SerialIterators.java| 7 +
.../phoenix/iterate/SpoolingResultIterator.java| 17 +
.../phoenix/iterate/TableResultIterator.java | 8 +
.../iterate/TableSnapshotResultIterator.java | 15 +-
.../phoenix/iterate/UnionResultIterators.java | 30 +-
.../phoenix/iterate/ConcatResultIteratorTest.java | 8 +
.../iterate/MaterializedResultIterators.java | 7 +
.../iterate/MergeSortResultIteratorTest.java | 17 +
55 files changed, 1552 insertions(+), 144 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/MockResultIterator.java
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/MockResultIterator.java
index e842317..5b5b643 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/MockResultIterator.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/MockResultIterator.java
@@ -28,6 +28,8 @@ import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.phoenix.compile.ExplainPlanAttributes
+.ExplainPlanAttributesBuilder;
import org.apache.phoenix.execute.TupleProjector;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.schema.tuple.ResultTuple;
@@ -56,6 +58,11 @@ public class MockResultIterator implements
PeekingResultIterator {
public void explain(List planSteps) {}
@Override
+public void explain(List planSteps,
+ExplainPlanAttributesBuilder explainPlanAttributesBuilder
[phoenix-omid] branch master updated (edce851 -> 0c7092a)
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 edce851 OMID-191 Fix missing executable permission because of MASSEMBLY-941 add 0c7092a OMID-192 fix missing jcommander dependency No new revisions were added by this update. Summary of changes: tso-server/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[phoenix] branch 4.x updated: PHOENIX-6245 Update tephra dependency version to 0.16.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 2b9455c PHOENIX-6245 Update tephra dependency version to 0.16.0 2b9455c is described below commit 2b9455c362e78b11361ac2b225d9b2f6b85c5434 Author: Istvan Toth AuthorDate: Fri Dec 4 06:46:47 2020 +0100 PHOENIX-6245 Update tephra dependency version to 0.16.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9d9bb6..f14d25e 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ 2.1.2 1.12.0 8.1.7.v20120910 -0.15.0-incubating +0.16.0 1.0.2 2.4.0 2.11.8
[phoenix] branch master updated: PHOENIX-6245 Update tephra dependency version to 0.16.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 995858f PHOENIX-6245 Update tephra dependency version to 0.16.0 995858f is described below commit 995858f223c6c23755ac83d1080952cf857ae4e0 Author: Istvan Toth AuthorDate: Fri Dec 4 06:49:53 2020 +0100 PHOENIX-6245 Update tephra dependency version to 0.16.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dcc5991..19ac080 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 3.2.2 2.10.5 2.1.2 -0.16.0-SNAPSHOT +0.16.0 1.0.2 2.9.5 1.0.4
svn commit: r1884174 - in /phoenix/site: publish/language/datatypes.html publish/language/functions.html publish/language/index.html publish/secondary_indexing.html source/src/site/markdown/secondary_
Author: stoty Date: Mon Dec 7 05:56:25 2020 New Revision: 1884174 URL: http://svn.apache.org/viewvc?rev=1884174=rev Log: PHOENIX-6236 Document Strongly Consistent Global Indexes on website Modified: phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/secondary_indexing.html phoenix/site/source/src/site/markdown/secondary_indexing.md Modified: phoenix/site/publish/language/datatypes.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1884174=1884173=1884174=diff == --- phoenix/site/publish/language/datatypes.html (original) +++ phoenix/site/publish/language/datatypes.html Mon Dec 7 05:56:25 2020 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/language/functions.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1884174=1884173=1884174=diff == --- phoenix/site/publish/language/functions.html (original) +++ phoenix/site/publish/language/functions.html Mon Dec 7 05:56:25 2020 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1884174=1884173=1884174=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Mon Dec 7 05:56:25 2020 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/secondary_indexing.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/secondary_indexing.html?rev=1884174=1884173=1884174=diff == --- phoenix/site/publish/secondary_indexing.html (original) +++ phoenix/site/publish/secondary_indexing.html Mon Dec 7 05:56:25 2020 @@ -1,7 +1,7 @@ @@ -195,7 +195,7 @@ Global Indexes - Global indexing targets read heavy uses cases. With global indexes, all the performance penalties for indexes occur at write time. We intercept the data table updates on write (DELETE, UPSERT VALUES and UPSERT SELECT), build the index update and then sent any necessary updates to all interested index tables. At read time, Phoenix will select the index table to use that will produce the fastest query time and directly scan it just like any other HBase table. By default, unless hinted, an index will not be used for a query that references a column that isn’t part of the index. + Global indexing targets read heavy uses cases. With global indexes, all the performance penalties for indexes occur at write time. We intercept the data table updates on write (DELETE, UPSERT VALUES and UPSERT SELECT), build the index update and then sent any necessary updates to all interested index tables. At read time, Phoenix will select the index table to use that will produce the fastest query time and directly scan it just like any other HBase table. An index will not be used for a query that references a column that isn’t part of the index. Local Indexes @@ -224,7 +224,7 @@ ASYNC Index threshold - As of 4.16, setting the phoenix.index.async.threshold property to a positive number will disallow synchronous index creation if the estimated indexed data size exceeds phoenix.index.async.threshold (in bytes). + As of 4.16 (and 5.1), setting the phoenix.index.async.threshold property to a positive number will disallow synchronous index creation if the estimated indexed data size exceeds phoenix.index.async.threshold (in bytes). @@ -235,7 +235,7 @@ SELECT v2 FROM my_table WHERE v1 = 'foo' - There are three means of getting an index to be used in this case: + There are two means of getting an index to be used in this case: Create a covered index by including v2 in the index: @@ -243,12 +243,6 @@ CREATE INDEX my_index ON my_table (v1) INCLUDE (v2) This will cause the v2 column value to be copied into the index and kept in synch as it changes. This will obviously increase the size of the index. - Hint the query to force it to use the index: - - -SELECT /*+ INDEX(my_table my_index) */ v2 FROM my_table WHERE v1 = 'foo' - -This will cause each data row to be retrieved when the index is traversed to find the missing v2 column value. This hint should only be used if you know that the index has good selective (i.e. a small number of table rows have a value of ‘foo’ in this example), as otherwise you’ll get better performance by the default behavior of doing a full table scan. Create a local index: @@ -282,12 +276,16 @@ CREATE LOCAL INDEX my_index ON my_table However, since indexes are stored in separate tables than
[phoenix] branch 4.x updated: PHOENIX-6242 Remove remaining commons-logging references
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 4f8eab9 PHOENIX-6242 Remove remaining commons-logging references
4f8eab9 is described below
commit 4f8eab98cefd95670842040ea74fdd046da5781c
Author: Istvan Toth
AuthorDate: Thu Dec 3 11:43:06 2020 +0100
PHOENIX-6242 Remove remaining commons-logging references
---
.../src/it/java/org/apache/phoenix/end2end/MaxLookbackIT.java | 6 +++---
.../org/apache/phoenix/end2end/index/GlobalIndexCheckerIT.java | 7 ---
.../apache/phoenix/coprocessor/BaseScannerRegionObserver.java | 6 +++---
.../org/apache/phoenix/hbase/index/IndexRegionObserver.java| 10 +-
.../index/write/AbstractParallelWriterIndexCommitter.java | 7 ---
.../hbase/index/write/LazyParallelWriterIndexCommitter.java| 4
.../main/java/org/apache/phoenix/index/GlobalIndexChecker.java | 6 +++---
pom.xml| 6 --
8 files changed, 22 insertions(+), 30 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MaxLookbackIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MaxLookbackIT.java
index 010b4f9..b97b210 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MaxLookbackIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MaxLookbackIT.java
@@ -18,8 +18,6 @@
package org.apache.phoenix.end2end;
import com.google.common.collect.Maps;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
@@ -41,6 +39,8 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.AfterClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.sql.Connection;
@@ -60,7 +60,7 @@ import static
org.apache.phoenix.util.TestUtil.assertTableHasVersions;
@NeedsOwnMiniClusterTest
public class MaxLookbackIT extends BaseUniqueNamesOwnClusterIT {
-private static final Log LOG = LogFactory.getLog(MaxLookbackIT.class);
+private static final Logger LOG =
LoggerFactory.getLogger(MaxLookbackIT.class);
private static final int MAX_LOOKBACK_AGE = 15;
private static final int ROWS_POPULATED = 2;
public static final int WAIT_AFTER_TABLE_CREATION_MILLIS = 1;
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerIT.java
index 07166a0..97efeee 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexCheckerIT.java
@@ -44,8 +44,7 @@ import java.util.Map;
import java.util.Properties;
import com.google.common.collect.Maps;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
import org.apache.phoenix.end2end.BaseUniqueNamesOwnClusterIT;
import org.apache.phoenix.end2end.IndexToolIT;
import org.apache.phoenix.hbase.index.IndexRegionObserver;
@@ -65,10 +64,12 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import com.google.common.collect.Lists;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RunWith(Parameterized.class)
public class GlobalIndexCheckerIT extends BaseUniqueNamesOwnClusterIT {
-private static final Log LOG =
LogFactory.getLog(GlobalIndexCheckerIT.class);
+private static final Logger LOG =
LoggerFactory.getLogger(GlobalIndexCheckerIT.class);
private final boolean async;
private String tableDDLOptions;
private StringBuilder optionBuilder;
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
index a3857c1..e028e41 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
@@ -22,8 +22,6 @@ import java.util.Collections;
import java.util.List;
import java.util.NavigableSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
@@ -61,9 +59,11 @@ import org.apache.phoenix.schema.types.PUnsignedTinyint;
import org.apache.phoenix.util.ScanUtil;
import org.apache.phoenix.util.ServerUtil;
import org.apache.phoenix.util.TransactionUtil;
+import
[phoenix] branch master updated: PHOENIX-6242 Remove remaining commons-logging references
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 7d9f78d PHOENIX-6242 Remove remaining commons-logging references
7d9f78d is described below
commit 7d9f78d12f6ffece81bfae26619394e92f7f7ecb
Author: Istvan Toth
AuthorDate: Thu Dec 3 11:19:30 2020 +0100
PHOENIX-6242 Remove remaining commons-logging references
---
phoenix-server/pom.xml | 5 -
pom.xml| 6 --
2 files changed, 11 deletions(-)
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index c90322a..d189cb1 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -407,11 +407,6 @@
protobuf-java
provided
-
- commons-logging
- commons-logging
- provided
-
diff --git a/pom.xml b/pom.xml
index bf119e8..dcc5991 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,6 @@
2.5
3.8
1.0
-1.2
1.9.0
2.1.1
1.3.9-1
@@ -1380,11 +1379,6 @@
-
-commons-logging
-commons-logging
-${commons-logging.version}
-
svn commit: r1884083 - in /phoenix/site: publish/download.html publish/js/download.js publish/language/datatypes.html publish/language/functions.html publish/language/index.html source/src/site/markdo
Author: stoty
Date: Fri Dec 4 04:58:04 2020
New Revision: 1884083
URL: http://svn.apache.org/viewvc?rev=1884083=rev
Log:
Add Phoenix Tephra 0.16.0 to download page
Remove Phoenix 5.0.0alpha from download page
Modified:
phoenix/site/publish/download.html
phoenix/site/publish/js/download.js
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
phoenix/site/source/src/site/resources/js/download.js
Modified: phoenix/site/publish/download.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/download.html?rev=1884083=1884082=1884083=diff
==
--- phoenix/site/publish/download.html (original)
+++ phoenix/site/publish/download.html Fri Dec 4 04:58:04 2020
@@ -1,7 +1,7 @@
@@ -203,6 +203,17 @@
+
+
+
+ Phoenix Tephra Version
+ Release Date
+ Download
+
+
+
+
+
@@ -228,10 +239,10 @@ addRelease('4.14.0-cdh5.14.2','09/jun/20
addRelease('4.14.0-cdh5.13.2','09/jun/2018');
addRelease('4.14.0-cdh5.12.2','09/jun/2018');
addRelease('4.14.0-cdh5.11.2','09/jun/2018');
-addRelease('5.0.0-alpha-HBase-2.0','09/feb/2018');
addPhoenixdbRelease('1.0.0','18/sep/2020');
addPhoenixThirdpartyRelease('1.0.0','26/okt/2020');
addPhoenixOmidRelease('1.0.2','23/nov/2020');
+addPhoenixTephraRelease('0.16.0','04/dec/2020');
//]]>
Modified: phoenix/site/publish/js/download.js
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/js/download.js?rev=1884083=1884082=1884083=diff
==
--- phoenix/site/publish/js/download.js (original)
+++ phoenix/site/publish/js/download.js Fri Dec 4 04:58:04 2020
@@ -73,3 +73,18 @@ function addPhoenixOmidRelease(version,
'';
document.getElementById('phoenix-omid-releases').appendChild(tr);
}
+
+function addPhoenixTephraRelease(version, date) {
+var tr = document.createElement('tr');
+tr.innerHTML =
+'' + version + '' +
+'' + date + '' +
+'' +
+ 'src ' +
+ '' +
+ '[ sha512' +
+ ' | asc ]' +
+'' +
+'';
+document.getElementById('phoenix-tephra-releases').appendChild(tr);
+}
Modified: phoenix/site/publish/language/datatypes.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1884083=1884082=1884083=diff
==
--- phoenix/site/publish/language/datatypes.html (original)
+++ phoenix/site/publish/language/datatypes.html Fri Dec 4 04:58:04 2020
@@ -1,7 +1,7 @@
Modified: phoenix/site/publish/language/functions.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1884083=1884082=1884083=diff
==
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Fri Dec 4 04:58:04 2020
@@ -1,7 +1,7 @@
Modified: phoenix/site/publish/language/index.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1884083=1884082=1884083=diff
==
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Fri Dec 4 04:58:04 2020
@@ -1,7 +1,7 @@
Modified: phoenix/site/source/src/site/markdown/download.md
URL:
http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/download.md?rev=1884083=1884082=1884083=diff
==
--- phoenix/site/source/src/site/markdown/download.md (original)
+++ phoenix/site/source/src/site/markdown/download.md Fri Dec 4 04:58:04 2020
@@ -33,6 +33,14 @@ Current release 4.15.0 can run on Apache
+
+
+Phoenix Tephra Version
+Release Date
+Download
+
+
+
Python Driver Version
@@ -56,10 +64,10 @@ addRelease('4.14.0-cdh5.14.2','09/jun/20
addRelease('4.14.0-cdh5.13.2','09/jun/2018');
addRelease('4.14.0-cdh5.12.2','09/jun/2018');
addRelease('4.14.0-cdh5.11.2','09/jun/2018');
-addRelease('5.0.0-alpha-HBase-2.0','09/feb/2018');
addPhoenixdbRelease('1.0.0','18/sep/2020');
addPhoenixThirdpartyRelease('1.0.0','26/okt/2020');
addPhoenixOmidRelease('1.0.2','23/nov/2020');
+addPhoenixTephraRelease('0.16.0','04/dec/2020');
//]]>
Modified: phoenix/site/source/src/site/resources/js/download.js
URL:
http://svn.apache.org/viewvc/phoenix/site/source/src/site/resources/js/download.js?rev=1884083=1884082=1884083=diff
==
--- phoenix/site/source/src/site/resources/js/download.js (original)
+++ phoenix/site/source/src/site/resour
[phoenix-tephra] annotated tag 0.16.0 created (now dd1f803)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to annotated tag 0.16.0 in repository https://gitbox.apache.org/repos/asf/phoenix-tephra.git. at dd1f803 (tag) tagging b3dc67e28e89ab53408b33c803b2c8fb7868ba99 (commit) replaces v0.15.0-incubating by Istvan Toth on Fri Dec 4 05:38:15 2020 +0100 - Log - Phoenix Tephra 0.16.0 release --- No new revisions were added by this update.
svn commit: r44845 - /dev/phoenix/phoenix-tephra-0.16.0RC2/ /release/phoenix/phoenix-tephra-0.16.0/
Author: stoty Date: Fri Dec 4 04:35:57 2020 New Revision: 44845 Log: release phoenix-tephra 0.16.0RC2 as phoenix-tephra-0.16.0 Added: release/phoenix/phoenix-tephra-0.16.0/ - copied from r44844, dev/phoenix/phoenix-tephra-0.16.0RC2/ Removed: dev/phoenix/phoenix-tephra-0.16.0RC2/
[phoenix-connectors] branch master updated: PHOENIX-6240 Standardize connectors logging on SLF4j
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 234ed7c PHOENIX-6240 Standardize connectors logging on SLF4j
234ed7c is described below
commit 234ed7c88447e178d7f12d87c000b2bba98ef250
Author: Istvan Toth
AuthorDate: Wed Dec 2 08:19:38 2020 +0100
PHOENIX-6240 Standardize connectors logging on SLF4j
---
.../main/java/org/apache/phoenix/compat/HiveCompatUtil.java | 4 ++--
.../objectinspector/AbstractPhoenixObjectInspector.java | 11 ++-
.../main/java/org/apache/phoenix/compat/HiveCompatUtil.java | 6 +++---
.../objectinspector/AbstractPhoenixObjectInspector.java | 13 +++--
phoenix-hive-base/pom.xml | 7 ---
.../org/apache/phoenix/hive/BaseHivePhoenixStoreIT.java | 6 +++---
.../main/java/org/apache/phoenix/hive/PhoenixMetaHook.java | 9 -
.../java/org/apache/phoenix/hive/PhoenixRecordUpdater.java | 6 +++---
.../src/main/java/org/apache/phoenix/hive/PhoenixSerDe.java | 7 ---
.../java/org/apache/phoenix/hive/PhoenixSerializer.java | 6 +++---
.../java/org/apache/phoenix/hive/PhoenixStorageHandler.java | 7 +++
.../apache/phoenix/hive/mapreduce/PhoenixInputFormat.java | 6 +++---
.../apache/phoenix/hive/mapreduce/PhoenixOutputFormat.java | 6 +++---
.../apache/phoenix/hive/mapreduce/PhoenixRecordReader.java | 6 +++---
.../apache/phoenix/hive/mapreduce/PhoenixRecordWriter.java | 6 +++---
.../phoenix/hive/mapreduce/PhoenixResultWritable.java | 6 +++---
.../hive/objectinspector/PhoenixObjectInspectorFactory.java | 6 +++---
.../apache/phoenix/hive/ppd/PhoenixPredicateDecomposer.java | 6 +++---
.../phoenix/hive/ql/index/IndexPredicateAnalyzer.java | 6 +++---
.../org/apache/phoenix/hive/query/PhoenixQueryBuilder.java | 6 +++---
.../org/apache/phoenix/hive/util/ColumnMappingUtils.java| 6 +++---
.../org/apache/phoenix/hive/util/PhoenixConnectionUtil.java | 8
.../apache/phoenix/hive/util/PhoenixStorageHandlerUtil.java | 12 +++-
.../main/java/org/apache/phoenix/hive/util/PhoenixUtil.java | 6 +++---
phoenix-pig-base/pom.xml| 6 --
.../java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java | 6 +++---
.../java/org/apache/phoenix/pig/PhoenixHBaseLoader.java | 7 +++
.../org/apache/phoenix/pig/util/PhoenixPigSchemaUtil.java | 6 +++---
.../apache/phoenix/pig/util/QuerySchemaParserFunction.java | 7 ---
.../phoenix/pig/util/SqlQueryToColumnInfoFunction.java | 8 +---
.../src/main/java/org/apache/phoenix/pig/util/TypeUtil.java | 6 +++---
phoenix-spark-base/pom.xml | 5 ++---
.../phoenix/spark/datasource/v2/PhoenixDataSource.java | 5 +++--
.../spark/datasource/v2/writer/PhoenixDataWriter.java | 6 --
34 files changed, 112 insertions(+), 118 deletions(-)
diff --git
a/phoenix-hive-base/phoenix4-hive/src/main/java/org/apache/phoenix/compat/HiveCompatUtil.java
b/phoenix-hive-base/phoenix4-hive/src/main/java/org/apache/phoenix/compat/HiveCompatUtil.java
index 71c4f8e..c5b5052 100644
---
a/phoenix-hive-base/phoenix4-hive/src/main/java/org/apache/phoenix/compat/HiveCompatUtil.java
+++
b/phoenix-hive-base/phoenix4-hive/src/main/java/org/apache/phoenix/compat/HiveCompatUtil.java
@@ -17,7 +17,6 @@
*/
package org.apache.phoenix.compat;
-import org.apache.commons.logging.Log;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.QueryState;
import org.apache.hadoop.hive.ql.io.AcidOutputFormat;
@@ -27,6 +26,7 @@ import org.apache.hadoop.hive.ql.parse.ParseDriver;
import org.apache.hadoop.hive.ql.parse.SemanticAnalyzer;
import org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc;
import org.apache.hadoop.hive.ql.session.SessionState;
+import org.slf4j.Logger;
import java.io.File;
import java.lang.reflect.Method;
@@ -44,7 +44,7 @@ public class HiveCompatUtil {
return comparisonExpr;
}
-public static String getOptionsValue(AcidOutputFormat.Options options,
AtomicReference GET_BUCKET_METHOD_REF, AtomicReference
GET_BUCKET_ID_METHOD_REF, Log LOG) {
+public static String getOptionsValue(AcidOutputFormat.Options options,
AtomicReference GET_BUCKET_METHOD_REF, AtomicReference
GET_BUCKET_ID_METHOD_REF, Logger LOG) {
StringBuilder content = new StringBuilder();
int bucket = options.getBucket();
diff --git
a/phoenix-hive-base/phoenix4-hive/src/main/java/org/apache/phoenix/hive/objectinspector/AbstractPhoenixObjectInspector.java
b/phoenix-hive-base/phoenix4-hive/src/main/java/org/apache/phoenix/hive/objectinspector/AbstractPhoenixObjectInspector.java
index 7e406cd..1a0e2e9 100644
---
a/phoenix-hive-base/phoenix4-hive/src/main/java/org/apache/phoenix/hive
[phoenix-queryserver] branch master updated: PHOENIX-6238 Fix missing executable permission because of MASSEMBLY-941
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 0973ef3 PHOENIX-6238 Fix missing executable permission because of
MASSEMBLY-941
0973ef3 is described below
commit 0973ef35e0c404435019ff46db8fe1492d23a45d
Author: Richard Antal
AuthorDate: Tue Dec 1 17:46:01 2020 +0100
PHOENIX-6238 Fix missing executable permission because of MASSEMBLY-941
---
pom.xml | 6 ++
1 file changed, 6 insertions(+)
diff --git a/pom.xml b/pom.xml
index bcd8126..ef16bbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,7 @@
4.12
+3.1.1
2.9
1.9.1
4.1.3
@@ -166,6 +167,11 @@
+org.apache.maven.plugins
+maven-assembly-plugin
+${maven-assembly-plugin.version}
+
+
maven-dependency-plugin
[phoenix-connectors] branch master updated: PHOENIX-6238 Fix missing executable permission because of MASSEMBLY-941
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 885e2b8 PHOENIX-6238 Fix missing executable permission because of
MASSEMBLY-941
885e2b8 is described below
commit 885e2b82e7698ca7a2deb4c116af99ad1886431e
Author: Richard Antal
AuthorDate: Tue Dec 1 17:39:49 2020 +0100
PHOENIX-6238 Fix missing executable permission because of MASSEMBLY-941
---
pom.xml | 6 ++
1 file changed, 6 insertions(+)
diff --git a/pom.xml b/pom.xml
index 3243b90..b6148ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,7 @@
3.4.12
+3.1.1
2.22.2
2.22.2
3.1.1
@@ -161,6 +162,11 @@
${jdk.version}
+
+org.apache.maven.plugins
+maven-assembly-plugin
+${maven-assembly-plugin-version}
+
[phoenix-omid] branch master updated: OMID-191 Fix missing executable permission because of MASSEMBLY-941
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 edce851 OMID-191 Fix missing executable permission because of
MASSEMBLY-941
edce851 is described below
commit edce85130175ad022117a8fde7b5709f317908ba
Author: Richard Antal
AuthorDate: Tue Dec 1 17:20:47 2020 +0100
OMID-191 Fix missing executable permission because of MASSEMBLY-941
---
pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pom.xml b/pom.xml
index 41cba74..f0463ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,6 +199,7 @@
2.4.2
+3.1.1
4.1.0
2.7
2.11
@@ -250,6 +251,7 @@
maven-assembly-plugin
+${maven-assembly-plugin-version}
true
[phoenix] branch 4.x updated: PHOENIX-6237 Relocate javax. classes in phoenix-client
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 160153c PHOENIX-6237 Relocate javax. classes in phoenix-client
160153c is described below
commit 160153ccba2a4fb78d5232b81e1e11403512e64b
Author: Istvan Toth
AuthorDate: Tue Dec 1 11:40:21 2020 +0100
PHOENIX-6237 Relocate javax. classes in phoenix-client
---
phoenix-client-parent/pom.xml | 12
1 file changed, 12 insertions(+)
diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml
index 0217e8a..079df61 100644
--- a/phoenix-client-parent/pom.xml
+++ b/phoenix-client-parent/pom.xml
@@ -200,6 +200,18 @@
${shaded.package}.javax.ws.
+ javax/annotation/
+
${shaded.package}.javax.annotation.
+
+
+ javax/inject/
+ ${shaded.package}.javax.inject.
+
+
+ javax/validation/
+
${shaded.package}.javax.validation.
+
+
net/
${shaded.package}.net.
[phoenix] branch master updated: PHOENIX-6237 Relocate javax. classes in 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 8c260aa PHOENIX-6237 Relocate javax. classes in phoenix-client
8c260aa is described below
commit 8c260aa4145a95d22edb028dde29dea83b2f80a7
Author: Istvan Toth
AuthorDate: Tue Dec 1 11:40:21 2020 +0100
PHOENIX-6237 Relocate javax. classes in phoenix-client
---
phoenix-client-parent/pom.xml | 12
1 file changed, 12 insertions(+)
diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml
index 2423261..4cd3f73 100644
--- a/phoenix-client-parent/pom.xml
+++ b/phoenix-client-parent/pom.xml
@@ -204,6 +204,18 @@
${shaded.package}.javax.ws.
+ javax/annotation/
+
${shaded.package}.javax.annotation.
+
+
+ javax/inject/
+ ${shaded.package}.javax.inject.
+
+
+ javax/validation/
+
${shaded.package}.javax.validation.
+
+
net/
${shaded.package}.net.
[phoenix] 02/02: PHOENIX-6223 could not find or load main class sqline.SqLine
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 commit 18b9f7615bdfdbd297ba14dbeac6725efdbf0a9b Author: litianmei AuthorDate: Fri Nov 13 11:22:33 2020 +0800 PHOENIX-6223 could not find or load main class sqline.SqLine --- bin/phoenix_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py index 0e4bc49..cf675d0 100755 --- a/bin/phoenix_utils.py +++ b/bin/phoenix_utils.py @@ -77,7 +77,7 @@ def findClasspath(command_name): return tryDecode(subprocess.Popen(command, shell=True, stdout=subprocess.PIPE).stdout.read()) def setPath(): -PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client.jar" +PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client*[!s].jar" PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar" PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-*-queryserver.jar" PHOENIX_LOADBALANCER_JAR_PATTERN = "phoenix-load-balancer-*[!t][!e][!s][!t][!s].jar"
[phoenix] 01/02: Revert "PHOENIX-6223 could not find or load main class sqline.SqLine"
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 commit a38518d4b3bff131393fe2a753bbf002e49b0f0c Author: Istvan Toth AuthorDate: Tue Dec 1 09:58:03 2020 +0100 Revert "PHOENIX-6223 could not find or load main class sqline.SqLine" applied the wrong pull request This reverts commit 619562196e5ebd1302a5414576b21595f4b6ff72. --- bin/phoenix_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py index 9c43e8f..0e4bc49 100755 --- a/bin/phoenix_utils.py +++ b/bin/phoenix_utils.py @@ -77,7 +77,7 @@ def findClasspath(command_name): return tryDecode(subprocess.Popen(command, shell=True, stdout=subprocess.PIPE).stdout.read()) def setPath(): -PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client*.jar" +PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client.jar" PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar" PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-*-queryserver.jar" PHOENIX_LOADBALANCER_JAR_PATTERN = "phoenix-load-balancer-*[!t][!e][!s][!t][!s].jar"
[phoenix] branch 4.x updated (277b6fd -> 18b9f76)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to branch 4.x in repository https://gitbox.apache.org/repos/asf/phoenix.git. from 277b6fd PHOENIX-5960 : Creating view on non-existent table should throw TNFE new a38518d Revert "PHOENIX-6223 could not find or load main class sqline.SqLine" new 18b9f76 PHOENIX-6223 could not find or load main class sqline.SqLine The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: bin/phoenix_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[phoenix] 02/02: PHOENIX-6223 could not find or load main class sqline.SqLine
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 180ebda82692329719f73d17a1c774e18e676295 Author: litianmei AuthorDate: Fri Nov 13 11:22:33 2020 +0800 PHOENIX-6223 could not find or load main class sqline.SqLine --- bin/phoenix_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py index 0e4bc49..cf675d0 100755 --- a/bin/phoenix_utils.py +++ b/bin/phoenix_utils.py @@ -77,7 +77,7 @@ def findClasspath(command_name): return tryDecode(subprocess.Popen(command, shell=True, stdout=subprocess.PIPE).stdout.read()) def setPath(): -PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client.jar" +PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client*[!s].jar" PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar" PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-*-queryserver.jar" PHOENIX_LOADBALANCER_JAR_PATTERN = "phoenix-load-balancer-*[!t][!e][!s][!t][!s].jar"
[phoenix] branch master updated (3860636 -> 180ebda)
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 3860636 PHOENIX-5960 : Creating view on non-existent table should throw TNFE new 728214d Revert "PHOENIX-6223 could not find or load main class sqline.SqLine" new 180ebda PHOENIX-6223 could not find or load main class sqline.SqLine The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: bin/phoenix_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[phoenix] 01/02: Revert "PHOENIX-6223 could not find or load main class sqline.SqLine"
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 728214da96aca0e81fdf957239d89eea8669fd8e Author: Istvan Toth AuthorDate: Tue Dec 1 09:52:42 2020 +0100 Revert "PHOENIX-6223 could not find or load main class sqline.SqLine" applied the wrong pull request This reverts commit 993ad5e9b60afe6b5111e790958062d6a4aabfdb. --- bin/phoenix_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py index 9c43e8f..0e4bc49 100755 --- a/bin/phoenix_utils.py +++ b/bin/phoenix_utils.py @@ -77,7 +77,7 @@ def findClasspath(command_name): return tryDecode(subprocess.Popen(command, shell=True, stdout=subprocess.PIPE).stdout.read()) def setPath(): -PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client*.jar" +PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client.jar" PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar" PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-*-queryserver.jar" PHOENIX_LOADBALANCER_JAR_PATTERN = "phoenix-load-balancer-*[!t][!e][!s][!t][!s].jar"
svn commit: r44755 - in /dev/phoenix: phoenix-tephra-0.16.0RC2/ phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/
Author: stoty Date: Mon Nov 30 13:12:17 2020 New Revision: 44755 Log: fix RC dir name Added: dev/phoenix/phoenix-tephra-0.16.0RC2/ - copied from r44754, dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/ Removed: dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/
[phoenix-tephra] tag 0.16.0RC2 created (now b3dc67e)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to tag 0.16.0RC2 in repository https://gitbox.apache.org/repos/asf/phoenix-tephra.git. at b3dc67e (commit) No new revisions were added by this update.
svn commit: r44754 - in /dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99: ./ CHANGES.md RELEASENOTES.md phoenix-tephra-0.16.0-src.tar.gz phoenix-tephra-0.16.0-src.tar.gz.asc phoeni
Author: stoty Date: Mon Nov 30 13:04:38 2020 New Revision: 44754 Log: Apache phoenix-tephra b3dc67e28e89ab53408b33c803b2c8fb7868ba99 Added: dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/ dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/CHANGES.md dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/RELEASENOTES.md dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/phoenix-tephra-0.16.0-src.tar.gz (with props) dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/phoenix-tephra-0.16.0-src.tar.gz.asc dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/phoenix-tephra-0.16.0-src.tar.gz.sha512 Added: dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/CHANGES.md == --- dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/CHANGES.md (added) +++ dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/CHANGES.md Mon Nov 30 13:04:38 2020 @@ -0,0 +1,55 @@ + + +# TEPHRA Changelog + +## Release 0.16.0 - Unreleased (as of 2020-11-16) + + + +### NEW FEATURES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [TEPHRA-301](https://issues.apache.org/jira/browse/TEPHRA-301) | Support HBase 1.5.x | Major | . | +| [TEPHRA-309](https://issues.apache.org/jira/browse/TEPHRA-309) | Add HBase 1.6 compatibility | Blocker | . | +| [TEPHRA-307](https://issues.apache.org/jira/browse/TEPHRA-307) | Support Hbase 2.3 | Major | . | +| [TEPHRA-305](https://issues.apache.org/jira/browse/TEPHRA-305) | Support HBase 2.1 and 2.2 | Blocker | . | + + +### IMPROVEMENTS: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [TEPHRA-314](https://issues.apache.org/jira/browse/TEPHRA-314) | Clean up lib dir in distribution assembly | Major | . | +| [TEPHRA-310](https://issues.apache.org/jira/browse/TEPHRA-310) | Add OWASP dependency check, and update the flagged direct dependencies | Major | . | +| [TEPHRA-308](https://issues.apache.org/jira/browse/TEPHRA-308) | create artifact with shaded Guava and Twill in Tephra | Major | . | +| [TEPHRA-304](https://issues.apache.org/jira/browse/TEPHRA-304) | Remove Support for Java 7 | Major | . | + + +### BUG FIXES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [TEPHRA-302](https://issues.apache.org/jira/browse/TEPHRA-302) | Add tests and examples for HBase 1.5.x | Blocker | . | +| [TEPHRA-312](https://issues.apache.org/jira/browse/TEPHRA-312) | Revert TEPHRA-304 | Blocker | core | +| [TEPHRA-303](https://issues.apache.org/jira/browse/TEPHRA-303) | HBase 1.1 tests don't compile | Major | . | +| [TEPHRA-299](https://issues.apache.org/jira/browse/TEPHRA-299) | Executing a large batch delete is very slow | Major | . | +| [TEPHRA-300](https://issues.apache.org/jira/browse/TEPHRA-300) | Tephra coprocessors do not close passed scanner | Major | . | + + Added: dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/RELEASENOTES.md == --- dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/RELEASENOTES.md (added) +++ dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/RELEASENOTES.md Mon Nov 30 13:04:38 2020 @@ -0,0 +1,24 @@ + + +# TEPHRA 0.16.0 Release Notes + +These release notes cover new developer and user-facing incompatibilities, important issues, features, and major improvements. + + + Added: dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/phoenix-tephra-0.16.0-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/phoenix-tephra-0.16.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/phoenix-tephra-0.16.0-src.tar.gz.asc == --- dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/phoenix-tephra-0.16.0-src.tar.gz.asc (added) +++ dev/phoenix/phoenix-tephra-b3dc67e28e89ab53408b33c803b2c8fb7868ba99/phoenix-tephra-0.16.0-src.tar.gz.asc Mon Nov 30 13:04:38 2020 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEglIDpwQFvIOuz199lzUcG3lEM8cFAl/E7eEACgkQlzUcG3lE +M8fP7gf+JlFNTT2qmK1rQXK0JmzYFvo5A66ojOJAj8EDRbsZIthT3iZ2USlUwJfD +Bh+Pv9Mu29NdDSf9+J42WGe0Ybwp5PD16vxY/Tolhc/YAyU8QfVaAOoY+z5ABWlf +KnWRZyA+YOdVZiO9O7/nmBANQx7NSuK6uk2fcUXUMxkyQ3ym6prnEIpi6ar7oiK8 +2VvnsnEWIerZBuUo9BaVV8sgHfPmsTgsyOFavdV0Klmyw1c65y0UsOZlp64yW8pi +Lb1eAXAUnUPMPM9I7MN3cNCRJoehGsMO3e65fSCKTOlU02BryDfKXDI5n49tRrfL
[phoenix-tephra] branch release/0.16.0 updated: TEPHRA-315 tephra-example maven setup is broken (addendum: fix apache-rat-plugin config)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch release/0.16.0 in repository https://gitbox.apache.org/repos/asf/phoenix-tephra.git The following commit(s) were added to refs/heads/release/0.16.0 by this push: new b3dc67e TEPHRA-315 tephra-example maven setup is broken (addendum: fix apache-rat-plugin config) b3dc67e is described below commit b3dc67e28e89ab53408b33c803b2c8fb7868ba99 Author: Istvan Toth AuthorDate: Mon Nov 30 10:33:35 2020 +0100 TEPHRA-315 tephra-example maven setup is broken (addendum: fix apache-rat-plugin config) --- pom.xml| 34 +- tephra-core-shaded/pom.xml | 7 +++ 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index f923fe6..9b0143c 100644 --- a/pom.xml +++ b/pom.xml @@ -449,6 +449,23 @@ org.apache.rat apache-rat-plugin + + + build-number.txt + README.rst + RELEASING.rst + **/target/** + **/.git/** + .gitignore + **/.idea/** + **/*.iml + **/.project + **/.classpath + **/.settings/** + licenses/** + **/NOTICE_BINARY + + rat-check @@ -456,23 +473,6 @@ check - - - build-number.txt - README.rst - RELEASING.rst - **/target/** - **/.git/** - .gitignore - **/.idea/** - **/*.iml - **/.project - **/.classpath - **/.settings/** - licenses/** - **/NOTICE_BINARY - - diff --git a/tephra-core-shaded/pom.xml b/tephra-core-shaded/pom.xml index bce3921..ff48a7e 100644 --- a/tephra-core-shaded/pom.xml +++ b/tephra-core-shaded/pom.xml @@ -98,6 +98,13 @@ + +org.apache.rat +apache-rat-plugin + + true + +
[phoenix-tephra] branch master updated: TEPHRA-315 tephra-example maven setup is broken (addendum: fix apache-rat-plugin config)
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-tephra.git The following commit(s) were added to refs/heads/master by this push: new fb2270a TEPHRA-315 tephra-example maven setup is broken (addendum: fix apache-rat-plugin config) fb2270a is described below commit fb2270a3fa8d2e40cda075bce94d09ea56802c49 Author: Istvan Toth AuthorDate: Mon Nov 30 10:33:35 2020 +0100 TEPHRA-315 tephra-example maven setup is broken (addendum: fix apache-rat-plugin config) --- pom.xml| 34 +- tephra-core-shaded/pom.xml | 7 +++ 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 33741bd..15cd7b9 100644 --- a/pom.xml +++ b/pom.xml @@ -449,6 +449,23 @@ org.apache.rat apache-rat-plugin + + + build-number.txt + README.rst + RELEASING.rst + **/target/** + **/.git/** + .gitignore + **/.idea/** + **/*.iml + **/.project + **/.classpath + **/.settings/** + licenses/** + **/NOTICE_BINARY + + rat-check @@ -456,23 +473,6 @@ check - - - build-number.txt - README.rst - RELEASING.rst - **/target/** - **/.git/** - .gitignore - **/.idea/** - **/*.iml - **/.project - **/.classpath - **/.settings/** - licenses/** - **/NOTICE_BINARY - - diff --git a/tephra-core-shaded/pom.xml b/tephra-core-shaded/pom.xml index 473cde8..a8eeab7 100644 --- a/tephra-core-shaded/pom.xml +++ b/tephra-core-shaded/pom.xml @@ -98,6 +98,13 @@ + +org.apache.rat +apache-rat-plugin + + true + +
[phoenix-tephra] branch release/0.16.0 updated: TEPHRA-315 tephra-example maven setup is broken (addendum: re-add explcit execution for maven-shade-plugin)
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch release/0.16.0
in repository https://gitbox.apache.org/repos/asf/phoenix-tephra.git
The following commit(s) were added to refs/heads/release/0.16.0 by this push:
new 3d79679 TEPHRA-315 tephra-example maven setup is broken (addendum:
re-add explcit execution for maven-shade-plugin)
3d79679 is described below
commit 3d796798138f1b7505311750c418933524cfb141
Author: Istvan Toth
AuthorDate: Mon Nov 30 08:10:16 2020 +0100
TEPHRA-315 tephra-example maven setup is broken (addendum: re-add explcit
execution for maven-shade-plugin)
---
tephra-core-shaded/pom.xml | 36 ++--
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/tephra-core-shaded/pom.xml b/tephra-core-shaded/pom.xml
index 33a1ae6..bce3921 100644
--- a/tephra-core-shaded/pom.xml
+++ b/tephra-core-shaded/pom.xml
@@ -46,20 +46,20 @@
maven-shade-plugin
true
-
${basedir}/target/dependency-reduced-pom.xml
-true
-
-
-org.apache.tephra:tephra-core
-org.apache.twill:twill-api
-org.apache.twill:twill-common
-org.apache.twill:twill-core
-org.apache.twill:twill-discovery-api
-org.apache.twill:twill-discovery-core
-org.apache.twill:twill-zookeeper
-com.google.guava:guava
-
-
+
${basedir}/target/dependency-reduced-pom.xml
+ true
+
+
+ org.apache.tephra:tephra-core
+ org.apache.twill:twill-api
+ org.apache.twill:twill-common
+ org.apache.twill:twill-core
+ org.apache.twill:twill-discovery-api
+ org.apache.twill:twill-discovery-core
+ org.apache.twill:twill-zookeeper
+ com.google.guava:guava
+
+
*:*
@@ -89,6 +89,14 @@
+
+
+package
+
+ shade
+
+
+
[phoenix-tephra] branch master updated: TEPHRA-315 tephra-example maven setup is broken (addendum: re-add explcit execution for maven-shade-plugin)
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-tephra.git
The following commit(s) were added to refs/heads/master by this push:
new eafd5e6 TEPHRA-315 tephra-example maven setup is broken (addendum:
re-add explcit execution for maven-shade-plugin)
eafd5e6 is described below
commit eafd5e6e37577bf56507ad2fc11b4cbb23bed0b4
Author: Istvan Toth
AuthorDate: Mon Nov 30 08:10:16 2020 +0100
TEPHRA-315 tephra-example maven setup is broken (addendum: re-add explcit
execution for maven-shade-plugin)
---
tephra-core-shaded/pom.xml | 36 ++--
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/tephra-core-shaded/pom.xml b/tephra-core-shaded/pom.xml
index 5475cce..473cde8 100644
--- a/tephra-core-shaded/pom.xml
+++ b/tephra-core-shaded/pom.xml
@@ -46,20 +46,20 @@
maven-shade-plugin
true
-
${basedir}/target/dependency-reduced-pom.xml
-true
-
-
-org.apache.tephra:tephra-core
-org.apache.twill:twill-api
-org.apache.twill:twill-common
-org.apache.twill:twill-core
-org.apache.twill:twill-discovery-api
-org.apache.twill:twill-discovery-core
-org.apache.twill:twill-zookeeper
-com.google.guava:guava
-
-
+
${basedir}/target/dependency-reduced-pom.xml
+ true
+
+
+ org.apache.tephra:tephra-core
+ org.apache.twill:twill-api
+ org.apache.twill:twill-common
+ org.apache.twill:twill-core
+ org.apache.twill:twill-discovery-api
+ org.apache.twill:twill-discovery-core
+ org.apache.twill:twill-zookeeper
+ com.google.guava:guava
+
+
*:*
@@ -89,6 +89,14 @@
+
+
+package
+
+ shade
+
+
+
[phoenix] branch 4.x updated: PHOENIX-6223 could not find or load main class sqline.SqLine
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 6195621 PHOENIX-6223 could not find or load main class sqline.SqLine 6195621 is described below commit 619562196e5ebd1302a5414576b21595f4b6ff72 Author: litianmei AuthorDate: Fri Nov 13 11:22:33 2020 +0800 PHOENIX-6223 could not find or load main class sqline.SqLine --- bin/phoenix_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py index 0e4bc49..9c43e8f 100755 --- a/bin/phoenix_utils.py +++ b/bin/phoenix_utils.py @@ -77,7 +77,7 @@ def findClasspath(command_name): return tryDecode(subprocess.Popen(command, shell=True, stdout=subprocess.PIPE).stdout.read()) def setPath(): -PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client.jar" +PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client*.jar" PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar" PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-*-queryserver.jar" PHOENIX_LOADBALANCER_JAR_PATTERN = "phoenix-load-balancer-*[!t][!e][!s][!t][!s].jar"
[phoenix] branch master updated: PHOENIX-6223 could not find or load main class sqline.SqLine
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 993ad5e PHOENIX-6223 could not find or load main class sqline.SqLine 993ad5e is described below commit 993ad5e9b60afe6b5111e790958062d6a4aabfdb Author: litianmei AuthorDate: Fri Nov 13 11:22:33 2020 +0800 PHOENIX-6223 could not find or load main class sqline.SqLine --- bin/phoenix_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py index 0e4bc49..9c43e8f 100755 --- a/bin/phoenix_utils.py +++ b/bin/phoenix_utils.py @@ -77,7 +77,7 @@ def findClasspath(command_name): return tryDecode(subprocess.Popen(command, shell=True, stdout=subprocess.PIPE).stdout.read()) def setPath(): -PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client.jar" +PHOENIX_CLIENT_JAR_PATTERN = "phoenix-client*.jar" PHOENIX_THIN_CLIENT_JAR_PATTERN = "phoenix-*-thin-client.jar" PHOENIX_QUERYSERVER_JAR_PATTERN = "phoenix-*-queryserver.jar" PHOENIX_LOADBALANCER_JAR_PATTERN = "phoenix-load-balancer-*[!t][!e][!s][!t][!s].jar"
[phoenix-connectors] branch master updated: PHOENIX-6180 Investigate flaky tests in Phoenix Connectors
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 ad05445 PHOENIX-6180 Investigate flaky tests in Phoenix Connectors
ad05445 is described below
commit ad05445501992766b45d7652ef3d9257c238
Author: Istvan Toth
AuthorDate: Wed Nov 18 10:01:21 2020 +0100
PHOENIX-6180 Investigate flaky tests in Phoenix Connectors
make HivePhoenixStoreIT abstract
start only one HBase minicluster for Hive tests
do not run hive tests in parallel
set separate DFS work dir for Hive miniclsuter
restore github workflows test
---
.github/workflows/maven.yml| 36 +
phoenix-hive-base/phoenix5-hive/pom.xml| 19 +--
phoenix-hive-base/pom.xml | 35 -
.../phoenix/hive/BaseHivePhoenixStoreIT.java | 87 ++--
.../org/apache/phoenix/hive/HiveMapReduceIT.java | 4 -
.../apache/phoenix/hive/HivePhoenixStoreIT.java| 153 -
.../src/test/resources/hbase-site.xml | 17 +++
phoenix-kafka-base/pom.xml | 35 ++---
phoenix-spark-base/phoenix5-spark/pom.xml | 1 -
phoenix4-connectors-assembly/pom.xml | 75 ++
phoenix5-connectors-assembly/pom.xml | 64 +
pom.xml| 36 ++---
12 files changed, 329 insertions(+), 233 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 000..5839864
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,36 @@
+# 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.
+
+name: phoenix-connectors preCommit Build
+
+on:
+ pull_request:
+
+jobs:
+ build:
+runs-on: ubuntu-18.04
+steps:
+- uses: actions/checkout@v1
+- name: Set up JDK 1.8
+ uses: actions/setup-java@v1
+ with:
+java-version: 1.8
+- name: Build
+ run: mvn -B clean install -DskipTests
+# The build doesn't seem to pick up the result of the install from above,
so just re-compile
+# and the Maven reactor will find it just fine.
+- name: Test
+ run: mvn -B verify
diff --git a/phoenix-hive-base/phoenix5-hive/pom.xml
b/phoenix-hive-base/phoenix5-hive/pom.xml
index 9167f18..22566e9 100644
--- a/phoenix-hive-base/phoenix5-hive/pom.xml
+++ b/phoenix-hive-base/phoenix5-hive/pom.xml
@@ -34,13 +34,10 @@
${project.build.directory}/tmp
-4.1.47.Final
${phoenix-five.version}
${hbase-two.version}
${hadoop-three.version}
-1.12.0
${hive3.version}
-9.3.8.v20160314
1.8
5
@@ -70,12 +67,6 @@
org.apache.hadoop
hadoop-mapreduce-client-core
-
-
- io.netty
- netty
-
-
org.apache.logging.log4j
@@ -83,11 +74,11 @@
2.14.0
test
-
-org.apache.hadoop
-hadoop-minicluster
-test
-
+
+ org.apache.hadoop
+ hadoop-minicluster
+ test
+
diff --git a/phoenix-hive-base/pom.xml b/phoenix-hive-base/pom.xml
index f4066ed..dc1c72f 100644
--- a/phoenix-hive-base/pom.xml
+++ b/phoenix-hive-base/pom.xml
@@ -40,10 +40,7 @@
${project.build.directory}/tmp
-4.1.47.Final
-1.8.0
0.9.1
-8.1.7.v20120910
1.8
3.9
@@ -247,15 +244,21 @@
org.apache.tez:tez-dag
-
org.apache.logging.log4j:log4j-core
org.apache.hadoop:hadoop-minicluster
+
+org.apache.hadoop:hadoop-hdfs
+
+
+
+com.google.code.findbugs:jsr305
+
@@ -297,6 +300,30 @@
+ maven-failsafe-plugin
+
+
+
[phoenix] branch 4.x updated: PHOENIX-4412 Tephra transaction context visibility level returns null instead of SNAPSHOT_ALL
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 e351543 PHOENIX-4412 Tephra transaction context visibility level
returns null instead of SNAPSHOT_ALL
e351543 is described below
commit e3515433e6cb629ae9cdd06f153b47c95b49a78f
Author: Istvan Toth
AuthorDate: Wed Nov 25 13:11:47 2020 +0100
PHOENIX-4412 Tephra transaction context visibility level returns null
instead of SNAPSHOT_ALL
---
.../java/org/apache/phoenix/transaction/TephraTransactionContext.java| 1 +
1 file changed, 1 insertion(+)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
index f63c492..2cf2ed7 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
@@ -356,6 +356,7 @@ public class TephraTransactionContext implements
PhoenixTransactionContext {
break;
case SNAPSHOT_ALL:
phoenixVisibilityLevel = PhoenixVisibilityLevel.SNAPSHOT_ALL;
+break;
default:
phoenixVisibilityLevel = null;
}
[phoenix] branch master updated: PHOENIX-4412 Tephra transaction context visibility level returns null instead of SNAPSHOT_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.git
The following commit(s) were added to refs/heads/master by this push:
new d1fc3f5 PHOENIX-4412 Tephra transaction context visibility level
returns null instead of SNAPSHOT_ALL
d1fc3f5 is described below
commit d1fc3f50d2c44a50871f351610488e5554faed8c
Author: Istvan Toth
AuthorDate: Wed Nov 25 13:11:47 2020 +0100
PHOENIX-4412 Tephra transaction context visibility level returns null
instead of SNAPSHOT_ALL
---
.../java/org/apache/phoenix/transaction/TephraTransactionContext.java| 1 +
1 file changed, 1 insertion(+)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
index ddc392f..11402f9 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionContext.java
@@ -356,6 +356,7 @@ public class TephraTransactionContext implements
PhoenixTransactionContext {
break;
case SNAPSHOT_ALL:
phoenixVisibilityLevel = PhoenixVisibilityLevel.SNAPSHOT_ALL;
+break;
default:
phoenixVisibilityLevel = null;
}
[phoenix] branch 4.x updated: PHOENIX-6233 QueryTimeoutIT fails sometimes.
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 864d110 PHOENIX-6233 QueryTimeoutIT fails sometimes.
864d110 is described below
commit 864d110e9387986c903c25e65c3444df5cc29af1
Author: Richard Antal
AuthorDate: Tue Nov 24 16:27:17 2020 +0100
PHOENIX-6233 QueryTimeoutIT fails sometimes.
---
phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
index ec2dc67..500dd94 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
@@ -106,7 +106,7 @@ public class QueryTimeoutIT extends
BaseUniqueNamesOwnClusterIT {
@Test
public void testQueryTimeout() throws Exception {
-int nRows = 3;
+int nRows = 6;
Connection conn;
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
conn = DriverManager.getConnection(getUrl(), props);
[phoenix] branch master updated: PHOENIX-6233 QueryTimeoutIT fails sometimes.
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 cfbd997 PHOENIX-6233 QueryTimeoutIT fails sometimes.
cfbd997 is described below
commit cfbd997448a16e01f3d52f03e299450c1b0d2599
Author: Richard Antal
AuthorDate: Tue Nov 24 16:27:17 2020 +0100
PHOENIX-6233 QueryTimeoutIT fails sometimes.
---
phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
index 42401ef..a2f2364 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
@@ -106,7 +106,7 @@ public class QueryTimeoutIT extends
BaseUniqueNamesOwnClusterIT {
@Test
public void testQueryTimeout() throws Exception {
-int nRows = 3;
+int nRows = 6;
Connection conn;
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
conn = DriverManager.getConnection(getUrl(), props);
[phoenix] branch 4.x updated: PHOENIX-6231 Update Omid to 1.0.2
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 c3818ee PHOENIX-6231 Update Omid to 1.0.2
c3818ee is described below
commit c3818ee2a7b07c43e961f432c173531157d4f6d9
Author: Istvan Toth
AuthorDate: Mon Nov 23 10:35:10 2020 +0100
PHOENIX-6231 Update Omid to 1.0.2
---
.../org/apache/phoenix/transaction/OmidTransactionProvider.java | 8 +---
pom.xml | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
index b1b9a62..9247248 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
@@ -119,7 +119,7 @@ public class OmidTransactionProvider implements
PhoenixTransactionProvider {
public CommitTable.Client getCommitTableClient() {
return commitTableClient;
}
-
+
@Override
public PhoenixTransactionService getTransactionService(Configuration
config, ConnectionInfo connectionInfo, int port) throws SQLException{
TSOServerConfig tsoConfig = new TSOServerConfig();
@@ -132,7 +132,8 @@ public class OmidTransactionProvider implements
PhoenixTransactionProvider {
Injector injector = Guice.createInjector(new TSOMockModule(tsoConfig));
tso = injector.getInstance(TSOServer.class);
-tso.startAndWait();
+tso.startAsync();
+tso.awaitRunning();
OmidClientConfiguration clientConfig = new OmidClientConfiguration();
clientConfig.setConnectionString("localhost:" + port);
@@ -183,7 +184,8 @@ public class OmidTransactionProvider implements
PhoenixTransactionProvider {
transactionManager.close();
}
if (tso != null) {
-tso.stopAndWait();
+tso.stopAsync();
+tso.awaitTerminated();
}
}
}
diff --git a/pom.xml b/pom.xml
index dcddcfe..fa38842 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
1.12.0
8.1.7.v20120910
0.15.0-incubating
-1.0.1
+1.0.2
2.4.0
2.11.8
2.11
[phoenix] branch master updated: PHOENIX-6231 Update Omid to 1.0.2
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 c4e56c3 PHOENIX-6231 Update Omid to 1.0.2 c4e56c3 is described below commit c4e56c3bb419326412c506777a1b8cc5cecfb3ca Author: Istvan Toth AuthorDate: Mon Nov 23 10:45:50 2020 +0100 PHOENIX-6231 Update Omid to 1.0.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fbe7d1e..bf119e8 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,7 @@ 2.10.5 2.1.2 0.16.0-SNAPSHOT -1.0.2-SNAPSHOT +1.0.2 2.9.5 1.0.4 4.0
svn commit: r44659 - in /dev/phoenix/phoenix-tephra-0.16.0RC1: ./ CHANGES.md RELEASENOTES.md phoenix-tephra-0.16.0-src.tar.gz phoenix-tephra-0.16.0-src.tar.gz.asc phoenix-tephra-0.16.0-src.tar.gz.sha5
Author: stoty Date: Tue Nov 24 09:54:50 2020 New Revision: 44659 Log: Apache phoenix-tephra 0.16.0RC1 Added: dev/phoenix/phoenix-tephra-0.16.0RC1/ dev/phoenix/phoenix-tephra-0.16.0RC1/CHANGES.md dev/phoenix/phoenix-tephra-0.16.0RC1/RELEASENOTES.md dev/phoenix/phoenix-tephra-0.16.0RC1/phoenix-tephra-0.16.0-src.tar.gz (with props) dev/phoenix/phoenix-tephra-0.16.0RC1/phoenix-tephra-0.16.0-src.tar.gz.asc dev/phoenix/phoenix-tephra-0.16.0RC1/phoenix-tephra-0.16.0-src.tar.gz.sha512 Added: dev/phoenix/phoenix-tephra-0.16.0RC1/CHANGES.md == --- dev/phoenix/phoenix-tephra-0.16.0RC1/CHANGES.md (added) +++ dev/phoenix/phoenix-tephra-0.16.0RC1/CHANGES.md Tue Nov 24 09:54:50 2020 @@ -0,0 +1,55 @@ + + +# TEPHRA Changelog + +## Release 0.16.0 - Unreleased (as of 2020-11-16) + + + +### NEW FEATURES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [TEPHRA-301](https://issues.apache.org/jira/browse/TEPHRA-301) | Support HBase 1.5.x | Major | . | +| [TEPHRA-309](https://issues.apache.org/jira/browse/TEPHRA-309) | Add HBase 1.6 compatibility | Blocker | . | +| [TEPHRA-307](https://issues.apache.org/jira/browse/TEPHRA-307) | Support Hbase 2.3 | Major | . | +| [TEPHRA-305](https://issues.apache.org/jira/browse/TEPHRA-305) | Support HBase 2.1 and 2.2 | Blocker | . | + + +### IMPROVEMENTS: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [TEPHRA-314](https://issues.apache.org/jira/browse/TEPHRA-314) | Clean up lib dir in distribution assembly | Major | . | +| [TEPHRA-310](https://issues.apache.org/jira/browse/TEPHRA-310) | Add OWASP dependency check, and update the flagged direct dependencies | Major | . | +| [TEPHRA-308](https://issues.apache.org/jira/browse/TEPHRA-308) | create artifact with shaded Guava and Twill in Tephra | Major | . | +| [TEPHRA-304](https://issues.apache.org/jira/browse/TEPHRA-304) | Remove Support for Java 7 | Major | . | + + +### BUG FIXES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [TEPHRA-302](https://issues.apache.org/jira/browse/TEPHRA-302) | Add tests and examples for HBase 1.5.x | Blocker | . | +| [TEPHRA-312](https://issues.apache.org/jira/browse/TEPHRA-312) | Revert TEPHRA-304 | Blocker | core | +| [TEPHRA-303](https://issues.apache.org/jira/browse/TEPHRA-303) | HBase 1.1 tests don't compile | Major | . | +| [TEPHRA-299](https://issues.apache.org/jira/browse/TEPHRA-299) | Executing a large batch delete is very slow | Major | . | +| [TEPHRA-300](https://issues.apache.org/jira/browse/TEPHRA-300) | Tephra coprocessors do not close passed scanner | Major | . | + + Added: dev/phoenix/phoenix-tephra-0.16.0RC1/RELEASENOTES.md == --- dev/phoenix/phoenix-tephra-0.16.0RC1/RELEASENOTES.md (added) +++ dev/phoenix/phoenix-tephra-0.16.0RC1/RELEASENOTES.md Tue Nov 24 09:54:50 2020 @@ -0,0 +1,24 @@ + + +# TEPHRA 0.16.0 Release Notes + +These release notes cover new developer and user-facing incompatibilities, important issues, features, and major improvements. + + + Added: dev/phoenix/phoenix-tephra-0.16.0RC1/phoenix-tephra-0.16.0-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/phoenix-tephra-0.16.0RC1/phoenix-tephra-0.16.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/phoenix-tephra-0.16.0RC1/phoenix-tephra-0.16.0-src.tar.gz.asc == --- dev/phoenix/phoenix-tephra-0.16.0RC1/phoenix-tephra-0.16.0-src.tar.gz.asc (added) +++ dev/phoenix/phoenix-tephra-0.16.0RC1/phoenix-tephra-0.16.0-src.tar.gz.asc Tue Nov 24 09:54:50 2020 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEglIDpwQFvIOuz199lzUcG3lEM8cFAl+82GQACgkQlzUcG3lE +M8cuCgf/RFdZMi2v3HOuzPjxRckXE0c56ePDYYS78Gi0E52F4pmFiT44yvC5rWaP +uRuNiTi17s+AJWZcynfgrFY7KtY/vweQLRK7OoP5ZMuYXR58QIG/a2pwGA+DFPoK +gKsXnPGe/yLdXt3EyIkW4p1wO7+3l8uV3R65OhrtPy/tvT3xzwH9MpiiXYsKm6ex +FdNhOJhuCY1dLHtmdymyYXDBzfelKueV2J1TAd3W+RHV1yRD4a3Hvk+3q2oB0Yor +bWzIftNSlccvb/c0360LcCt8jc1lK2cijiLF7jkKuoGrn2/oLryzsbFrt4ym7lMd +Xk1gnxEUiasIHcxg8i8I3EL1AAdW9g== +=02tS +-END PGP SIGNATURE- Added: dev/phoenix/phoenix-tephra-0.16.0RC1/phoenix-tephra-0.16.0-src.tar.gz.sha512 == --- dev/phoenix/phoenix-tephra-0.16.0RC1/phoenix-tephra-0.16.0-src.tar.gz.sha512 (added) +++ dev/phoenix/phoenix-tephra-0.16.0RC1/phoenix-tephra-0.16.0-src.tar.gz.sha512 Tue Nov 24 09:54:50 2020 @@ -0,0 +1,4 @@ +phoenix-tephra-0.16.0-src.tar.gz: DB48233A 344810C2 28703B2E 7C5BC649 B8F94D70 + 546481A2
[phoenix-tephra] tag 0.16.0RC1 created (now 708a937)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to tag 0.16.0RC1 in repository https://gitbox.apache.org/repos/asf/phoenix-tephra.git. at 708a937 (commit) No new revisions were added by this update.
[phoenix-omid] branch master updated: OMID-190 Update website for 1.0.2
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 90e13cc OMID-190 Update website for 1.0.2 90e13cc is described below commit 90e13cc71b284ef09b08a356b35935832304053d Author: Istvan Toth AuthorDate: Mon Nov 23 07:53:42 2020 +0100 OMID-190 Update website for 1.0.2 --- doc/site/markdown/mailing-lists.md | 6 +++--- doc/site/site.xml | 20 +++- pom.xml| 15 +-- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/doc/site/markdown/mailing-lists.md b/doc/site/markdown/mailing-lists.md index f0f6b92..1c69bf4 100644 --- a/doc/site/markdown/mailing-lists.md +++ b/doc/site/markdown/mailing-lists.md @@ -11,16 +11,16 @@ See the License for the specific language governing permissions and limitations under the License. --> -# Mailing Lists @ Apache Incubator +# Mailing Lists @ Apache Phoenix | Developers | Commits | | | --| -| d...@omid.incubator.apache.org| comm...@omid.incubator.apache.org | +| d...@phoenix.apache.org| commits@phoenix.apache.org | ## Subscribe In order to subscribe to a list, please add the '-subscribe' suffix to the identifier in each list and send an email. -For example use dev-subscr...@omid.incubator.apache.org to subscribe to the list of developers. +For example use dev-subscr...@phoenix.apache.org to subscribe to the list of developers. ## Unsubscribe Use the '-unsubscribe' suffix to unsubscribe from a list. diff --git a/doc/site/site.xml b/doc/site/site.xml index 7fa3829..f8f094a 100644 --- a/doc/site/site.xml +++ b/doc/site/site.xml @@ -1,4 +1,4 @@ - + org.apache.maven.skins @@ -31,16 +31,9 @@ 200 - -Apache Incubator -http://incubator.apache.org/images/egg-logo2.png -http://incubator.apache.org/ -200 - - - + http://maven.apache.org/; img="http://maven.apache.org/images/logos/maven-feather.png"/> @@ -50,12 +43,13 @@ - + -https://github.com/apache/incubator-omid; /> -https://dist.apache.org/repos/dist/release/incubator/omid/; /> +https://github.com/apache/phoenix-omid; /> +https://dist.apache.org/repos/dist/release/incubator/omid/; /> +https://dist.apache.org/repos/dist/release/phoenix/; /> @@ -72,7 +66,7 @@ -https://git-wip-us.apache.org/repos/asf/phoenix-omid.git; /> +https://gitbox.apache.org/repos/asf/phoenix-omid.git; /> https://issues.apache.org/jira/browse/Omid; /> diff --git a/pom.xml b/pom.xml index 99ace3b..41cba74 100644 --- a/pom.xml +++ b/pom.xml @@ -128,12 +128,23 @@ - https://gitbox.apache.org/repos/asf/phoenix-omid.git + scm:git:https://gitbox.apache.org/repos/asf/phoenix-omid.git scm:git:https://gitbox.apache.org/repos/asf/phoenix-omid.git -https://gitbox.apache.org/repos/asf/phoenix-omid.git +scm:git:https://gitbox.apache.org/repos/asf/phoenix-omid.git master + + +apache-omid-site + + git:asf-site://https://gitbox.apache.org/repos/asf/phoenix-omid-site.git + + +
[phoenix-tephra] 01/01: TEPHRA-315 tephra-example maven setup is broken
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch release/0.16.0
in repository https://gitbox.apache.org/repos/asf/phoenix-tephra.git
commit 708a937a1165d9a7805de0ba3e5d8d5ba51703cd
Author: Istvan Toth
AuthorDate: Mon Nov 16 09:50:26 2020 +0100
TEPHRA-315 tephra-example maven setup is broken
fix examples maven structure
update some maven plugin versions
---
pom.xml| 70 +
tephra-core-shaded/pom.xml | 41 +--
tephra-core/pom.xml| 1 -
.../tephra-examples-post-1.3/hbase-1.3/pom.xml | 1 -
.../tephra-examples-post-1.3/hbase-1.4/pom.xml | 8 +-
.../org/apache/tephra/examples/BalanceBooks.java | 341 -
.../org/apache/tephra/examples/package-info.java | 40 ---
.../apache/tephra/examples/BalanceBooksTest.java | 137 -
.../tephra-examples-post-1.3/hbase-1.5/pom.xml | 8 +-
.../tephra-examples-post-1.3/hbase-1.6/pom.xml | 8 +-
.../tephra-examples-post-1.3/hbase-2.0/pom.xml | 29 +-
.../org/apache/tephra/examples/BalanceBooks.java | 341 -
.../org/apache/tephra/examples/package-info.java | 40 ---
.../apache/tephra/examples/BalanceBooksTest.java | 137 -
.../tephra-examples-post-1.3/hbase-2.1/pom.xml | 29 +-
.../tephra-examples-post-1.3/hbase-2.2/pom.xml | 29 +-
.../tephra-examples-post-1.3/hbase-2.3/pom.xml | 29 +-
tephra-examples/tephra-examples-post-1.3/pom.xml | 1 -
tephra-examples/tephra-examples-pre-1.3/pom.xml| 1 -
tephra-hbase-compat-1.1-base/pom.xml | 1 -
tephra-hbase-compat-1.4-base/pom.xml | 1 -
tephra-hbase-compat-2.0-base/pom.xml | 1 -
22 files changed, 99 insertions(+), 1195 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0acd1bd..f923fe6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -407,7 +407,6 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.1
1.7
1.7
@@ -418,7 +417,6 @@
org.apache.maven.plugins
maven-surefire-plugin
- 2.14.1
-Xmx4096m -Djava.awt.headless=true -XX:MaxPermSize=256m
-Djava.net.preferIPv4Stack=true
${surefire.redirectTestOutputToFile}
@@ -441,11 +439,16 @@
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 3.2.0
+
+
org.apache.rat
apache-rat-plugin
- 0.10
rat-check
@@ -516,7 +519,6 @@
org.apache.maven.plugins
maven-release-plugin
- 2.5
v@{project.version}
true
@@ -538,22 +540,18 @@
org.apache.maven.plugins
maven-compiler-plugin
-3.1
org.apache.maven.plugins
maven-surefire-plugin
-2.14.1
org.apache.rat
apache-rat-plugin
-0.10
org.apache.maven.plugins
maven-checkstyle-plugin
-2.12.1
org.apache.maven.plugins
@@ -652,62 +650,6 @@
-
-
-
- apache-release
-
-
-
-org.apache.maven.plugins
-maven-assembly-plugin
-
- apache-tephra-${project.version}
-
-tar.gz
-
-
-
-
-org.apache.maven.plugins
-maven-remote-resources-plugin
-
-
- true
-
-
-
-
-
-false
-net.ju-n.maven.plugins
-checksum-maven-plugin
-
-
-
- files
-
-
-
-
-
-MD5
-SHA-512
-
-
-
- ${project.build.directory}
-
-
apache-tephra-${project.version}-${sourceReleaseAssemblyDescriptor}.tar.gz
-
-
-
-
-
-
-
-
-
diff --git a/tephra-core-shaded/pom.xml b/tephra-core-shaded/pom.xml
index 3e63b24..33a1ae6 100644
--- a/tephra-core-shaded/pom.xml
+++ b/tephra-core-shaded/pom.xml
@@ -45,6 +45,21 @@
org.apache.maven.plugins
maven-shade-plugin
+ true
+
${basedir}/target/dependency-reduced-pom.xml
+true
+
+
+org.apache.tephra:tephra-core
+org.apache.twill:twill-api
+org.apache.twill:twill-common
