[phoenix] branch master updated: PHOENIX-6178 Consider adopting the create-release scripts and process from HBase
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 6d84d0f PHOENIX-6178 Consider adopting the create-release scripts and process from HBase 6d84d0f is described below commit 6d84d0fcf8b906219af1232f49013938f38f5711 Author: Istvan Toth AuthorDate: Tue Oct 6 10:01:33 2020 +0200 PHOENIX-6178 Consider adopting the create-release scripts and process from HBase * copy and adapt dev/create-release from HBase * remove source assembly * add binary lincenses to binary assembly * use assembly as binary distribution --- dev/create-release/README.txt | 131 dev/create-release/do-release-docker.sh| 345 ++ dev/create-release/do-release.sh | 153 + dev/create-release/mac-sshd-gpg-agent/Dockerfile | 101 +++ dev/create-release/phoenix-rm/Dockerfile | 66 ++ dev/create-release/release-build.sh| 302 + dev/create-release/release-util.sh | 707 + dev/create-release/vote.tmpl | 31 + phoenix-assembly/pom.xml | 19 +- .../src/build/components/all-common-files.xml | 26 +- phoenix-assembly/src/build/src.xml | 127 pom.xml| 3 + 12 files changed, 1854 insertions(+), 157 deletions(-) diff --git a/dev/create-release/README.txt b/dev/create-release/README.txt new file mode 100644 index 000..2179ca1 --- /dev/null +++ b/dev/create-release/README.txt @@ -0,0 +1,131 @@ +Entrance script is _do-release-docker.sh_. Requires a local docker; +for example, on macOS, Docker for Desktop installed and running. + +For usage, pass '-h': + + $ ./do-release-docker.sh -h + +./do-release-docker.sh accepts the following options + + -d [path]required. working directory. output will be written to "output" in here. + -f "force" -- actually publish this release. Unless you specify '-f', it will + default to dry run mode, which checks and does local builds, but does not upload anything. + -t [tag] tag for the phoenix-rm docker image to use for building (default: "latest"). + -j [path]path to local JDK installation to use building. By default the script will + use openjdk8 installed in the docker image. + -p [project] project to build, such as 'phoenix' or 'phoenix-connectors'; defaults to phoenix env var + -r [repo]git repo to use for remote git operations. defaults to ASF gitbox for project. + -s [step]runs a single step of the process; valid steps are: tag|publish-dist|publish-release. + If none specified, runs tag, then publish-dist, and then publish-release. + 'publish-snapshot' is also an allowed, less used, option. + -h display usage information + -x debug. do less clean up. (env file, gpg forwarding on mac) + +For example, use the following command do a full dry run build of phoenix-thirdparty: + +./do-release-docker.sh -d /tmp/thirdparty-build -p phoenix-thirdparty + +To run a build w/o invoking docker (not recommended!), use _do_release.sh_. + +Both scripts will query interactively for needed parameters and passphrases. +For explanation of the parameters, execute: + $ release-build.sh --help + +Before starting the RC build, run a reconciliation of what is in +JIRA with what is in the commit log. Make sure they align and that +anomalies are explained up in JIRA. + +See http://hbase.apache.org/book.html#maven.release +(Even though the above documentation is for HBase, we use the same process for Phoenix.) + +Regardless of where your release build will run (locally, locally in docker, on a remote machine, +etc) you will need a local gpg-agent with access to your secret keys. A quick way to tell gpg +to clear out state and start a gpg-agent is via the following command phrase: + +$ gpgconf --kill all && gpg-connect-agent /bye + +Before starting an RC build, make sure your local gpg-agent has configs +to properly handle your credentials, especially if you want to avoid +typing the passphrase to your secret key. + +e.g. if you are going to run and step away, best to increase the TTL +on caching the unlocked secret via ~/.gnupg/gpg-agent.conf + # in seconds, e.g. a day + default-cache-ttl 86400 + max-cache-ttl 86400 + +Running a build on GCE is easy enough. Here are some notes if of use. +Create an instance. 4CPU/15G/10G disk seems to work well enough. +Once up, run the below to make your machine fit for RC building: + +Note that according to https://www.apache.org/legal/release-policy.html#owned-controlled-hardware +Building an Apache release must be done on hardware owned and controlled by the committer. + +# Presuming debian-comp
Apache-Phoenix | 4.x | HBase 1.6 | Build #73 SUCCESS
4.x branch HBase 1.6 build #73 status SUCCESS Build #73 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/73/
Apache-Phoenix | 4.x | HBase 1.4 | Build #73 SUCCESS
4.x branch HBase 1.4 build #73 status SUCCESS Build #73 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/73/
Apache-Phoenix | 4.x | HBase 1.3 | Build #73 FAILURE
4.x branch HBase 1.3 build #73 status FAILURE Build #73 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/73/
[phoenix] branch 4.x updated: PHOENIX-6124 : Addendum for JDK7 compatibility
This is an automated email from the ASF dual-hosted git repository.
yanxinyi 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 ac0538b PHOENIX-6124 : Addendum for JDK7 compatibility
ac0538b is described below
commit ac0538b7f5456dd4f91b948c1a51c0042e115955
Author: Viraj Jasani
AuthorDate: Sun Oct 25 22:44:27 2020 +0530
PHOENIX-6124 : Addendum for JDK7 compatibility
Signed-off-by: Xinyi Yan
---
.../phoenix/coprocessor/MetaDataEndpointImpl.java | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
index 0b9fd7e..847379b 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
@@ -97,7 +97,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.NavigableMap;
-import java.util.Optional;
import java.util.Properties;
import java.util.Set;
@@ -2595,8 +2594,8 @@ public class MetaDataEndpointImpl extends
MetaDataProtocol implements Coprocesso
* {@link ViewUtil#findAllDescendantViews(Table, Configuration,
byte[], byte[], byte[],
* long, boolean)}
* @param clientVersion client version, used to determine if mutation is
allowed.
- * @return Optional.empty() if mutation is allowed on parent table/view.
If not allowed,
- * returned Optional object will contain metaDataMutationResult with
MutationCode.
+ * @return null if mutation is allowed on parent table/view. If not
allowed,
+ * returned object will contain metaDataMutationResult with
MutationCode.
* @throws IOException if something goes wrong while retrieving
* child views using
* {@link ViewUtil#findAllDescendantViews(Table, Configuration,
byte[], byte[], byte[],
@@ -2605,7 +2604,7 @@ public class MetaDataEndpointImpl extends
MetaDataProtocol implements Coprocesso
* {@link ViewUtil#findAllDescendantViews(Table, Configuration,
byte[], byte[], byte[],
* long, boolean)}
*/
-private Optional validateIfMutationAllowedOnParent(
+private MetaDataMutationResult validateIfMutationAllowedOnParent(
final PTableType expectedType, final long clientTimeStamp,
final byte[] tenantId, final byte[] schemaName,
final byte[] tableOrViewName, final List childViews,
@@ -2645,9 +2644,9 @@ public class MetaDataEndpointImpl extends
MetaDataProtocol implements Coprocesso
new MetaDataMutationResult(
MetaDataProtocol.MutationCode.UNALLOWED_TABLE_MUTATION,
EnvironmentEdgeManager.currentTimeMillis(), null);
-return Optional.of(metaDataMutationResult);
+return metaDataMutationResult;
}
-return Optional.empty();
+return null;
}
private MetaDataMutationResult mutateColumn(
@@ -2677,12 +2676,12 @@ public class MetaDataEndpointImpl extends
MetaDataProtocol implements Coprocesso
List locks = Lists.newArrayList();
try {
List childViews = Lists.newArrayList();
-Optional mutationResult =
validateIfMutationAllowedOnParent(
+MetaDataMutationResult mutationResult =
validateIfMutationAllowedOnParent(
expectedType, clientTimeStamp, tenantId, schemaName,
tableOrViewName,
childViews, clientVersion);
// only if mutation is allowed, we should get Optional.empty()
here
-if (mutationResult.isPresent()) {
-return mutationResult.get();
+if (mutationResult != null) {
+return mutationResult;
}
acquireLock(region, key, locks);
Apache-Phoenix | master | HBase 2.2 | Build #87 SUCCESS
master branch HBase 2.2 build #87 status SUCCESS Build #87 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/87/
Apache-Phoenix | 4.x | HBase 1.6 | Build #72 FAILURE
4.x branch HBase 1.6 build #72 status FAILURE Build #72 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/72/
Apache-Phoenix | 4.x | HBase 1.4 | Build #72 SUCCESS
4.x branch HBase 1.4 build #72 status SUCCESS Build #72 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/72/
Apache-Phoenix | 4.x | HBase 1.3 | Build #72 FAILURE
4.x branch HBase 1.3 build #72 status FAILURE Build #72 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/72/
Apache-Phoenix | master | HBase 2.2 | Build #86 FAILURE
master branch HBase 2.2 build #86 status FAILURE Build #86 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/86/
[phoenix] branch 4.x updated: PHOENIX-6129 : Optimize tableExists() call while retrieving correct MUTEX table
This is an automated email from the ASF dual-hosted git repository.
chinmayskulkarni 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 1872f5f PHOENIX-6129 : Optimize tableExists() call while retrieving
correct MUTEX table
1872f5f is described below
commit 1872f5f2dc531d543ca6a9c111bb95966af6c6f8
Author: Viraj Jasani
AuthorDate: Tue Oct 27 01:27:29 2020 +0530
PHOENIX-6129 : Optimize tableExists() call while retrieving correct MUTEX
table
Signed-off-by: Chinmay Kulkarni
---
.../phoenix/query/ConnectionQueryServicesImpl.java | 52 +-
.../query/ConnectionQueryServicesImplTest.java | 43 ++
2 files changed, 64 insertions(+), 31 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 8fe3eec..62825d2 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -4335,19 +4335,12 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
* making use of HBase's checkAndPut api.
*
* @return true if client won the race, false otherwise
- * @throws IOException
* @throws SQLException
*/
@VisibleForTesting
public boolean acquireUpgradeMutex(long currentServerSideTableTimestamp)
-throws IOException,
-SQLException {
+throws SQLException {
Preconditions.checkArgument(currentServerSideTableTimestamp <
MIN_SYSTEM_TABLE_TIMESTAMP);
-byte[] sysMutexPhysicalTableNameBytes =
getSysMutexPhysicalTableNameBytes();
-if(sysMutexPhysicalTableNameBytes == null) {
-throw new
UpgradeInProgressException(getVersion(currentServerSideTableTimestamp),
-getVersion(MIN_SYSTEM_TABLE_TIMESTAMP));
-}
if (!writeMutexCell(null,
PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA,
PhoenixDatabaseMetaData.SYSTEM_CATALOG_TABLE, null, null)) {
throw new
UpgradeInProgressException(getVersion(currentServerSideTableTimestamp),
@@ -4360,15 +4353,13 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
public boolean writeMutexCell(String tenantId, String schemaName, String
tableName,
String columnName, String familyName) throws SQLException {
try {
-byte[] rowKey =
-columnName != null
-? SchemaUtil.getColumnKey(tenantId, schemaName,
tableName, columnName,
-familyName)
-: SchemaUtil.getTableKey(tenantId, schemaName,
tableName);
+byte[] rowKey = columnName != null
+? SchemaUtil.getColumnKey(tenantId, schemaName, tableName,
+columnName, familyName)
+: SchemaUtil.getTableKey(tenantId, schemaName, tableName);
// at this point the system mutex table should have been created or
// an exception thrown
-byte[] sysMutexPhysicalTableNameBytes =
getSysMutexPhysicalTableNameBytes();
-try (HTableInterface sysMutexTable =
getTable(sysMutexPhysicalTableNameBytes)) {
+try (Table sysMutexTable = getSysMutexTable()) {
byte[] family =
PhoenixDatabaseMetaData.SYSTEM_MUTEX_FAMILY_NAME_BYTES;
byte[] qualifier =
PhoenixDatabaseMetaData.SYSTEM_MUTEX_COLUMN_NAME_BYTES;
byte[] value = MUTEX_LOCKED;
@@ -4404,15 +4395,13 @@ public class ConnectionQueryServicesImpl extends
DelegateQueryServices implement
public void deleteMutexCell(String tenantId, String schemaName, String
tableName,
String columnName, String familyName) throws SQLException {
try {
-byte[] rowKey =
-columnName != null
-? SchemaUtil.getColumnKey(tenantId, schemaName,
tableName, columnName,
-familyName)
-: SchemaUtil.getTableKey(tenantId, schemaName,
tableName);
+byte[] rowKey = columnName != null
+? SchemaUtil.getColumnKey(tenantId, schemaName, tableName,
+columnName, familyName)
+: SchemaUtil.getTableKey(tenantId, schemaName, tableName);
// at this point the system mutex table should have been created or
// an exception thrown
-byte[] sysMutexPhysicalTableNameBytes =
getSysMutexPhysicalTableNameBytes();
-try (HTableInterface sysMutexTable =
getTable(sysMutexPhysicalTableNameBytes)) {
+try (Table sysMutexTable = getSysMutexTable()
Apache-Phoenix | master | HBase 2.1 | Build #86 SUCCESS
master branch HBase 2.1 build #86 status SUCCESS Build #86 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/86/
Apache-Phoenix | master | HBase 2.3 | Build #86 FAILURE
master branch HBase 2.3 build #86 status FAILURE Build #86 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/86/
[phoenix] branch master updated (601375e -> b9fb461)
This is an automated email from the ASF dual-hosted git repository. chinmayskulkarni pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git. from 601375e PHOENIX-6206 Update phoenix-thirdparty dependency version to 1.0.0 add b9fb461 PHOENIX-6129 : Optimize tableExists() call while retrieving correct MUTEX table (#920) No new revisions were added by this update. Summary of changes: .../phoenix/query/ConnectionQueryServicesImpl.java | 52 +- .../query/ConnectionQueryServicesImplTest.java | 40 + 2 files changed, 61 insertions(+), 31 deletions(-)
[phoenix-omid] branch master updated: OMID-164 Update phoenix-thirdparty dependency version to 1.0.0
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git The following commit(s) were added to refs/heads/master by this push: new 14a9256 OMID-164 Update phoenix-thirdparty dependency version to 1.0.0 14a9256 is described below commit 14a925626fe3a32ba0c17439ed82ecb5118d0438 Author: Istvan Toth AuthorDate: Mon Oct 26 13:37:31 2020 +0100 OMID-164 Update phoenix-thirdparty dependency version to 1.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c6dcca..788f3a0 100644 --- a/pom.xml +++ b/pom.xml @@ -175,7 +175,7 @@ 2.0.1 2.7.5 3.0.0 -1.0.0-SNAPSHOT +1.0.0 3.0 6.10 1.7.7
[phoenix] branch master updated: PHOENIX-6206 Update phoenix-thirdparty dependency version to 1.0.0
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git The following commit(s) were added to refs/heads/master by this push: new 601375e PHOENIX-6206 Update phoenix-thirdparty dependency version to 1.0.0 601375e is described below commit 601375e449e3249896989807c3f020187548b201 Author: Istvan Toth AuthorDate: Mon Oct 26 13:50:07 2020 +0100 PHOENIX-6206 Update phoenix-thirdparty dependency version to 1.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b47243..658c98d 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 3.0.3 2.2.1 -1.0.0-SNAPSHOT +1.0.0 src/main/antlr3
svn commit: r1882873 - 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: Mon Oct 26 12:07:28 2020
New Revision: 1882873
URL: http://svn.apache.org/viewvc?rev=1882873&view=rev
Log:
add phoenix-thirdparty 1.0.0 download links
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=1882873&r1=1882872&r2=1882873&view=diff
==
--- phoenix/site/publish/download.html (original)
+++ phoenix/site/publish/download.html Mon Oct 26 12:07:28 2020
@@ -1,7 +1,7 @@
@@ -181,6 +181,17 @@
+
+
+
+ Phoenix Thirdparty Version
+ Release Date
+ Download
+
+
+
+
+
@@ -208,6 +219,7 @@ addRelease('4.14.0-cdh5.12.2','09/jun/20
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');
//]]>
Modified: phoenix/site/publish/js/download.js
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/js/download.js?rev=1882873&r1=1882872&r2=1882873&view=diff
==
--- phoenix/site/publish/js/download.js (original)
+++ phoenix/site/publish/js/download.js Mon Oct 26 12:07:28 2020
@@ -44,3 +44,17 @@ function addPhoenixdbRelease(version, da
document.getElementById('python-phoenixdb-releases').appendChild(tr);
}
+function addPhoenixThirdpartyRelease(version, date) {
+var tr = document.createElement('tr');
+tr.innerHTML =
+'' + version + '' +
+'' + date + '' +
+'' +
+ 'src ' +
+ ' ' +
+ '[ sha512' +
+ ' | asc ]' +
+'' +
+'';
+document.getElementById('phoenix-thirdparty-releases').appendChild(tr);
+}
Modified: phoenix/site/publish/language/datatypes.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1882873&r1=1882872&r2=1882873&view=diff
==
--- phoenix/site/publish/language/datatypes.html (original)
+++ phoenix/site/publish/language/datatypes.html Mon Oct 26 12:07:28 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=1882873&r1=1882872&r2=1882873&view=diff
==
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Mon Oct 26 12:07:28 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=1882873&r1=1882872&r2=1882873&view=diff
==
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Mon Oct 26 12:07:28 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=1882873&r1=1882872&r2=1882873&view=diff
==
--- phoenix/site/source/src/site/markdown/download.md (original)
+++ phoenix/site/source/src/site/markdown/download.md Mon Oct 26 12:07:28 2020
@@ -17,6 +17,14 @@ Current release 4.15.0 can run on Apache
+
+
+Phoenix Thirdparty Version
+Release Date
+Download
+
+
+
Python Driver Version
@@ -42,5 +50,6 @@ addRelease('4.14.0-cdh5.12.2','09/jun/20
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');
//]]>
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=1882873&r1=1882872&r2=1882873&view=diff
==
--- phoenix/site/source/src/site/resources/js/download.js (original)
+++ phoenix/site/source/src/site/resources/js/download.js Mon Oct 26 12:07:28
2020
@@ -44,3 +44,17 @@ function addPhoenixdbRelease(version, da
document.getElementById('python-phoenixdb-releases').appendChild(tr);
}
+function addPhoenixThirdpartyRelease(version, date) {
+var tr = document.createElement('tr');
+tr.innerHTML =
+'' + version
