Apache-Phoenix | master | HBase 2.1 | Build #75 SUCCESS
master branch HBase 2.1 build #75 status SUCCESS Build #75 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/75/
[phoenix] branch master updated: PHOENIX-6189 DATA_EXCEEDS_MAX_CAPACITY exception error string should contain column name instead of actual value
This is an automated email from the ASF dual-hosted git repository.
yanxinyi 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 4703e46 PHOENIX-6189 DATA_EXCEEDS_MAX_CAPACITY exception error string
should contain column name instead of actual value
4703e46 is described below
commit 4703e469bd0007be3bd789fbb908df8f42d0b1e9
Author: Xinyi Yan
AuthorDate: Thu Oct 15 16:08:37 2020 -0700
PHOENIX-6189 DATA_EXCEEDS_MAX_CAPACITY exception error string should
contain column name instead of actual value
Signed-off-by: Xinyi Yan
---
.../org/apache/phoenix/end2end/UpsertSelectIT.java| 11 ---
.../org/apache/phoenix/compile/UpsertCompiler.java| 14 +-
.../coprocessor/UngroupedAggregateRegionObserver.java | 7 +--
.../exception/DataExceedsCapacityException.java | 18 +-
.../phoenix/expression/DecimalAddExpression.java | 2 +-
.../phoenix/expression/DecimalDivideExpression.java | 3 ++-
.../phoenix/expression/DecimalMultiplyExpression.java | 3 ++-
.../phoenix/expression/DecimalSubtractExpression.java | 2 +-
.../expression/function/ArrayModifierFunction.java| 2 +-
.../org/apache/phoenix/index/PhoenixIndexBuilder.java | 2 +-
.../main/java/org/apache/phoenix/parse/ColumnDef.java | 7 +++
.../java/org/apache/phoenix/schema/PTableImpl.java| 7 ---
.../java/org/apache/phoenix/schema/types/PBinary.java | 2 +-
.../java/org/apache/phoenix/schema/types/PChar.java | 2 +-
.../main/java/org/apache/phoenix/util/SchemaUtil.java | 3 ++-
.../java/org/apache/phoenix/schema/MutationTest.java | 19 ++-
16 files changed, 72 insertions(+), 32 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
index 6f0f877..c55e9b7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
@@ -1635,6 +1635,9 @@ public class UpsertSelectIT extends
ParallelStatsDisabledIT {
props.setProperty(QueryServices.ENABLE_SERVER_SIDE_UPSERT_MUTATIONS,
allowServerSideMutations);
String t1 = generateUniqueName();
+String validValue = "澴粖蟤य褻酃岤豦팑薰鄩脼ժ끦碉碉";
+String invalidValue = "澴粖蟤य褻酃岤豦팑薰鄩脼ժ끦碉碉碉";
+String columnTypeInfo = "VARCHAR(20)";
try (Connection conn = DriverManager.getConnection(getUrl(), props);
Statement stmt = conn.createStatement()) {
@@ -1654,7 +1657,7 @@ public class UpsertSelectIT extends
ParallelStatsDisabledIT {
Statement stmt = conn.createStatement()) {
conn.setAutoCommit(autoCommit);
stmt.execute("upsert into " + t1 + " (id, v) select id, "
-+ "'澴粖蟤य褻酃岤豦팑薰鄩脼ժ끦碉碉' from " + t1 + " WHERE id = 1");
++ "'" + validValue + "' from " + t1 + " WHERE id = 1");
conn.commit();
}
@@ -1665,18 +1668,20 @@ public class UpsertSelectIT extends
ParallelStatsDisabledIT {
assertTrue(rs.next());
assertEquals(1, rs.getLong(1));
-assertEquals("澴粖蟤य褻酃岤豦팑薰鄩脼ժ끦碉碉", rs.getString(2));
+assertEquals(validValue, rs.getString(2));
}
try (Connection conn = DriverManager.getConnection(getUrl(), props);
Statement stmt = conn.createStatement()) {
conn.setAutoCommit(autoCommit);
stmt.execute("upsert into " + t1 + " (id, v) select id, "
-+ "'澴粖蟤य褻酃岤豦팑薰鄩脼ժ끦碉碉碉' from " + t1 + " WHERE id = 1");
++ "'" + invalidValue + "' from " + t1 + " WHERE id = 1");
conn.commit();
fail();
} catch (SQLException e) {
assertEquals(SQLExceptionCode.DATA_EXCEEDS_MAX_CAPACITY.getErrorCode(),
e.getErrorCode());
+assertFalse(e.getMessage().contains(invalidValue));
+assertTrue(e.getMessage().contains(columnTypeInfo));
}
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
b/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
index 3a2a534..d3bad93 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
@@ -46,6 +46,7 @@ import org.apache.phoenix.compile.OrderByCompiler.OrderBy;
import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
import org.apache.phoenix.coprocessor.MetaDataProtocol;
import org.apache.phoenix.coprocessor.UngroupedAggregateRegionObserver;
+import org.apache.phoenix.exception.DataExceedsCapacityException;
import org.apache.phoenix.exception.SQLExceptionCode;
import
[phoenix] branch 4.x updated: PHOENIX-6189 DATA_EXCEEDS_MAX_CAPACITY exception error string should contain column name instead of actual value
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 3fc9727 PHOENIX-6189 DATA_EXCEEDS_MAX_CAPACITY exception error string
should contain column name instead of actual value
3fc9727 is described below
commit 3fc9727457c6c9ec28d0a9aecd5f088b0bd6704b
Author: Xinyi Yan
AuthorDate: Thu Oct 15 16:08:37 2020 -0700
PHOENIX-6189 DATA_EXCEEDS_MAX_CAPACITY exception error string should
contain column name instead of actual value
Signed-off-by: Xinyi Yan
---
.../org/apache/phoenix/end2end/UpsertSelectIT.java| 11 ---
.../org/apache/phoenix/compile/UpsertCompiler.java| 14 +-
.../coprocessor/UngroupedAggregateRegionObserver.java | 7 +--
.../exception/DataExceedsCapacityException.java | 18 +-
.../phoenix/expression/DecimalAddExpression.java | 2 +-
.../phoenix/expression/DecimalDivideExpression.java | 3 ++-
.../phoenix/expression/DecimalMultiplyExpression.java | 3 ++-
.../phoenix/expression/DecimalSubtractExpression.java | 2 +-
.../expression/function/ArrayModifierFunction.java| 2 +-
.../org/apache/phoenix/index/PhoenixIndexBuilder.java | 2 +-
.../main/java/org/apache/phoenix/parse/ColumnDef.java | 7 +++
.../java/org/apache/phoenix/schema/PTableImpl.java| 7 ---
.../java/org/apache/phoenix/schema/types/PBinary.java | 2 +-
.../java/org/apache/phoenix/schema/types/PChar.java | 2 +-
.../main/java/org/apache/phoenix/util/SchemaUtil.java | 3 ++-
.../java/org/apache/phoenix/schema/MutationTest.java | 19 ++-
16 files changed, 72 insertions(+), 32 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
index 6f0f877..c55e9b7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpsertSelectIT.java
@@ -1635,6 +1635,9 @@ public class UpsertSelectIT extends
ParallelStatsDisabledIT {
props.setProperty(QueryServices.ENABLE_SERVER_SIDE_UPSERT_MUTATIONS,
allowServerSideMutations);
String t1 = generateUniqueName();
+String validValue = "澴粖蟤य褻酃岤豦팑薰鄩脼ժ끦碉碉";
+String invalidValue = "澴粖蟤य褻酃岤豦팑薰鄩脼ժ끦碉碉碉";
+String columnTypeInfo = "VARCHAR(20)";
try (Connection conn = DriverManager.getConnection(getUrl(), props);
Statement stmt = conn.createStatement()) {
@@ -1654,7 +1657,7 @@ public class UpsertSelectIT extends
ParallelStatsDisabledIT {
Statement stmt = conn.createStatement()) {
conn.setAutoCommit(autoCommit);
stmt.execute("upsert into " + t1 + " (id, v) select id, "
-+ "'澴粖蟤य褻酃岤豦팑薰鄩脼ժ끦碉碉' from " + t1 + " WHERE id = 1");
++ "'" + validValue + "' from " + t1 + " WHERE id = 1");
conn.commit();
}
@@ -1665,18 +1668,20 @@ public class UpsertSelectIT extends
ParallelStatsDisabledIT {
assertTrue(rs.next());
assertEquals(1, rs.getLong(1));
-assertEquals("澴粖蟤य褻酃岤豦팑薰鄩脼ժ끦碉碉", rs.getString(2));
+assertEquals(validValue, rs.getString(2));
}
try (Connection conn = DriverManager.getConnection(getUrl(), props);
Statement stmt = conn.createStatement()) {
conn.setAutoCommit(autoCommit);
stmt.execute("upsert into " + t1 + " (id, v) select id, "
-+ "'澴粖蟤य褻酃岤豦팑薰鄩脼ժ끦碉碉碉' from " + t1 + " WHERE id = 1");
++ "'" + invalidValue + "' from " + t1 + " WHERE id = 1");
conn.commit();
fail();
} catch (SQLException e) {
assertEquals(SQLExceptionCode.DATA_EXCEEDS_MAX_CAPACITY.getErrorCode(),
e.getErrorCode());
+assertFalse(e.getMessage().contains(invalidValue));
+assertTrue(e.getMessage().contains(columnTypeInfo));
}
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
b/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
index 83c575f..67b8c50 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
@@ -45,6 +45,7 @@ import org.apache.phoenix.compile.OrderByCompiler.OrderBy;
import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
import org.apache.phoenix.coprocessor.MetaDataProtocol;
import org.apache.phoenix.coprocessor.UngroupedAggregateRegionObserver;
+import org.apache.phoenix.exception.DataExceedsCapacityException;
import org.apache.phoenix.exception.SQLExceptionCode;
import
Apache-Phoenix | master | HBase 2.3 | Build #74 ABORTED
master branch HBase 2.3 build #74 status ABORTED Build #74 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/74/
Apache-Phoenix | 4.x | HBase 1.6 | Build #60 ABORTED
4.x branch HBase 1.6 build #60 status ABORTED Build #60 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/60/
Apache-Phoenix | 4.x | HBase 1.3 | Build #60 ABORTED
4.x branch HBase 1.3 build #60 status ABORTED Build #60 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/60/
Apache-Phoenix | 4.x | HBase 1.4 | Build #60 ABORTED
4.x branch HBase 1.4 build #60 status ABORTED Build #60 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/60/
Apache-Phoenix | 4.x | HBase 1.6 | Build #59 ABORTED
4.x branch HBase 1.6 build #59 status ABORTED Build #59 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/59/
Apache-Phoenix | 4.x | HBase 1.4 | Build #59 ABORTED
4.x branch HBase 1.4 build #59 status ABORTED Build #59 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/59/
Apache-Phoenix | 4.x | HBase 1.3 | Build #59 ABORTED
4.x branch HBase 1.3 build #59 status ABORTED Build #59 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/59/
Apache-Phoenix | master | HBase 2.3 | Build #73 ABORTED
master branch HBase 2.3 build #73 status ABORTED Build #73 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/73/
Apache-Phoenix | master | HBase 2.2 | Build #74 FAILURE
master branch HBase 2.2 build #74 status FAILURE Build #74 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/74/
Apache-Phoenix | master | HBase 2.2 | Build #73 SUCCESS
master branch HBase 2.2 build #73 status SUCCESS Build #73 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/73/
Apache-Phoenix | master | HBase 2.1 | Build #74 SUCCESS
master branch HBase 2.1 build #74 status SUCCESS Build #74 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/74/
Apache-Phoenix | master | HBase 2.1 | Build #73 FAILURE
master branch HBase 2.1 build #73 status FAILURE Build #73 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/73/
[phoenix] branch 4.x updated: PHOENIX-6125 : Disable region split for SYSTEM.TASK
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 4d2cf8c PHOENIX-6125 : Disable region split for SYSTEM.TASK
4d2cf8c is described below
commit 4d2cf8c4c7e8e2bff4738843281ca1ba2bb49115
Author: Viraj Jasani
AuthorDate: Mon Oct 19 23:07:21 2020 +0530
PHOENIX-6125 : Disable region split for SYSTEM.TASK
Signed-off-by: Chinmay Kulkarni
---
.../phoenix/end2end/BackwardCompatibilityIT.java | 23 +++-
...ogUpgradeIT.java => SystemTablesUpgradeIT.java} | 42 ++
.../InvalidRegionSplitPolicyException.java | 49
.../apache/phoenix/exception/SQLExceptionCode.java | 6 +-
.../phoenix/query/ConnectionQueryServicesImpl.java | 65 +-
.../org/apache/phoenix/query/QueryConstants.java | 9 ++-
.../phoenix/schema/SystemTaskSplitPolicy.java | 28 ++
.../query/ConnectionQueryServicesImplTest.java | 47 +++-
8 files changed, 248 insertions(+), 21 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java
index e8ef84f..d20610a 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java
@@ -49,6 +49,7 @@ import
org.apache.curator.shaded.com.google.common.collect.Lists;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ConnectionFactory;
@@ -59,6 +60,7 @@ import org.apache.phoenix.jdbc.PhoenixDriver;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.query.QueryServices;
import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.schema.SystemTaskSplitPolicy;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.After;
@@ -329,10 +331,27 @@ public class BackwardCompatibilityIT {
executeQueriesWithCurrentVersion(QUERY_ADD_DELETE);
assertExpectedOutput(QUERY_ADD_DELETE);
}
-
+
+@Test
+public void testUpdatedSplitPolicyForSysTask() throws Exception {
+executeQueryWithClientVersion(compatibleClientVersion,
+CREATE_DIVERGED_VIEW);
+executeQueriesWithCurrentVersion(QUERY_CREATE_DIVERGED_VIEW);
+try (org.apache.hadoop.hbase.client.Connection conn =
+hbaseTestUtil.getConnection(); Admin admin = conn.getAdmin()) {
+HTableDescriptor tableDescriptor = admin.getTableDescriptor(
+TableName.valueOf(PhoenixDatabaseMetaData.SYSTEM_TASK_NAME));
+assertEquals("split policy not updated with compatible client
version: "
++ compatibleClientVersion,
+tableDescriptor.getRegionSplitPolicyClassName(),
+SystemTaskSplitPolicy.class.getName());
+}
+assertExpectedOutput(QUERY_CREATE_DIVERGED_VIEW);
+}
+
private void checkForPreConditions() throws Exception {
// For the first code cut of any major version, there wouldn't be any
backward compatible
-// clients. Hence the test wouldn't run and just return true when the
client
+// clients. Hence the test wouldn't run and just return true when the
client
// version to be tested is same as current version
assumeFalse(compatibleClientVersion.contains(MetaDataProtocol.CURRENT_CLIENT_VERSION));
// Make sure that cluster is clean before test execution with no
system tables
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogUpgradeIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablesUpgradeIT.java
similarity index 84%
rename from
phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogUpgradeIT.java
rename to
phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablesUpgradeIT.java
index 3fcef36..e38c5e6 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemCatalogUpgradeIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablesUpgradeIT.java
@@ -25,8 +25,11 @@ import java.sql.SQLException;
import java.util.Map;
import java.util.Properties;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Admin;
import org.apache.phoenix.coprocessor.MetaDataProtocol;
import org.apache.phoenix.jdbc.PhoenixConnection;
+import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
import
[phoenix] branch master updated (b9e0383 -> 370d8ed)
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 b9e0383 PHOENIX-6193 PHOENIX-6151 slows down shading
add 370d8ed PHOENIX-6125 : Disable region split for SYSTEM.TASK
No new revisions were added by this update.
Summary of changes:
.../phoenix/end2end/BackwardCompatibilityIT.java | 23 ++-
...ogUpgradeIT.java => SystemTablesUpgradeIT.java} | 42 +
.../InvalidRegionSplitPolicyException.java | 49 +++
.../apache/phoenix/exception/SQLExceptionCode.java | 6 +-
.../phoenix/query/ConnectionQueryServicesImpl.java | 70 +-
.../org/apache/phoenix/query/QueryConstants.java | 5 +-
...SplitPolicy.java => SystemTaskSplitPolicy.java} | 13 ++--
.../query/ConnectionQueryServicesImplTest.java | 48 ++-
8 files changed, 230 insertions(+), 26 deletions(-)
rename
phoenix-core/src/it/java/org/apache/phoenix/end2end/{SystemCatalogUpgradeIT.java
=> SystemTablesUpgradeIT.java} (84%)
create mode 100644
phoenix-core/src/main/java/org/apache/phoenix/exception/InvalidRegionSplitPolicyException.java
copy
phoenix-core/src/main/java/org/apache/phoenix/schema/{SystemFunctionSplitPolicy.java
=> SystemTaskSplitPolicy.java} (80%)
Apache-Phoenix | master | HBase 2.3 | Build #72 ABORTED
master branch HBase 2.3 build #72 status ABORTED Build #72 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/72/
[phoenix] branch 4.x updated: PHOENIX-6193 PHOENIX-6151 slows down shading
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 16e9ed9 PHOENIX-6193 PHOENIX-6151 slows down shading
16e9ed9 is described below
commit 16e9ed913d7cc1238e8953142781d59501f97648
Author: Istvan Toth
AuthorDate: Sat Oct 17 10:54:59 2020 +0200
PHOENIX-6193 PHOENIX-6151 slows down shading
simplify shading rules to speed it up
make client builds parallelizable
make embedded client skippable
change embedded client maven coordinates
---
Jenkinsfile| 2 +-
dev/phoenix-personality.sh | 2 +-
phoenix-assembly/pom.xml | 2 +-
.../src/build/components/all-common-jars.xml | 4 +-
.../phoenix-client-embedded/pom.xml| 66 +
phoenix-client-parent/phoenix-client/pom.xml | 65 +
{phoenix-client => phoenix-client-parent}/pom.xml | 159 -
pom.xml| 14 +-
8 files changed, 175 insertions(+), 139 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 89be88e..817643d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -58,7 +58,7 @@ pipeline {
checkout scm
sh """#!/bin/bash
ulimit -a
-mvn clean verify
-Dhbase.profile=${HBASE_PROFILE} -B
+mvn clean verify -Dskip.embedded
-Dhbase.profile=${HBASE_PROFILE} -B
"""
}
}
diff --git a/dev/phoenix-personality.sh b/dev/phoenix-personality.sh
index ae5806f..692981e 100755
--- a/dev/phoenix-personality.sh
+++ b/dev/phoenix-personality.sh
@@ -140,7 +140,7 @@ function personality_modules
# Running with threads>1 seems to trigger some problem in the build, but
since we
# spend 80+% of the time in phoenix-core, it wouldn't help much anyway
- extra="--threads=1 -DPhoenixPatchProcess"
+ extra="--threads=1 -DPhoenixPatchProcess -Dskip.embedded"
if [[ "${PATCH_BRANCH}" = 4* ]]; then
extra="${extra} -Dhttps.protocols=TLSv1.2"
fi
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 1bb72e1..32939c9 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -49,7 +49,7 @@
ln
-
${project.basedir}/../phoenix-client/target
+
${project.basedir}/../phoenix-client-parent/phoenix-client/target
-fnsv
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml
b/phoenix-assembly/src/build/components/all-common-jars.xml
index 7a1514c..f6234e3 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -24,11 +24,10 @@
- ${project.basedir}/../phoenix-client/target
+
${project.basedir}/../phoenix-client-parent/phoenix-client/target
/
phoenix-client-${project.version}.jar
-phoenix-client.jar
@@ -36,7 +35,6 @@
/
phoenix-server-${project.version}.jar
-phoenix-server.jar
diff --git a/phoenix-client-parent/phoenix-client-embedded/pom.xml
b/phoenix-client-parent/phoenix-client-embedded/pom.xml
new file mode 100644
index 000..058843a
--- /dev/null
+++ b/phoenix-client-parent/phoenix-client-embedded/pom.xml
@@ -0,0 +1,66 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+ 4.0.0
+
+org.apache.phoenix
+phoenix-client-parent
+4.16.0-SNAPSHOT
+
+ phoenix-client-embedded
+ Phoenix Client Embedded
+ Phoenix Client without logging implementation
+ jar
+
+
+
+
+org.apache.maven.plugins
+maven-shade-plugin
+
+
+embedded-shaded
+package
+
+ shade
+
+
+
true
+ false
+ true
+
${basedir}/target/pom.xml
+
+
+ *:*
+
+
+ org.apache.phoenix:phoenix-client
+ xom:xom
+ org.slf4j:slf4j-log4j12
+
+
+
+
+
+
+
+
+
+
diff --git a/phoenix-client-parent/phoenix-client/pom.xml
b/phoenix-client-parent/phoenix-client/pom.xml
new file mode 100644
index 000..043ec2f
--- /dev/null
+++
[phoenix] branch master updated: PHOENIX-6193 PHOENIX-6151 slows down shading
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 b9e0383 PHOENIX-6193 PHOENIX-6151 slows down shading
b9e0383 is described below
commit b9e03834fdfc896e501a83bfc60e9099f5ded21b
Author: Istvan Toth
AuthorDate: Sat Oct 17 10:54:59 2020 +0200
PHOENIX-6193 PHOENIX-6151 slows down shading
simplify shading rules to speed it up
make client builds parallelizable
make embedded client skippable
change embedded client maven coordinates
---
Jenkinsfile| 2 +-
dev/phoenix-personality.sh | 2 +-
phoenix-assembly/pom.xml | 2 +-
.../src/build/components/all-common-jars.xml | 4 +-
.../phoenix-client-embedded/pom.xml| 66 +
phoenix-client-parent/phoenix-client/pom.xml | 65 +
{phoenix-client => phoenix-client-parent}/pom.xml | 159 -
pom.xml| 14 +-
8 files changed, 175 insertions(+), 139 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d7f08f8..5bb1ebd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -75,7 +75,7 @@ pipeline {
checkout scm
sh """#!/bin/bash
ulimit -a
-mvn clean verify
-Dhbase.profile=${HBASE_PROFILE} -B
+mvn clean verify -Dskip.embedded
-Dhbase.profile=${HBASE_PROFILE} -B
"""
}
}
diff --git a/dev/phoenix-personality.sh b/dev/phoenix-personality.sh
index ae5806f..692981e 100755
--- a/dev/phoenix-personality.sh
+++ b/dev/phoenix-personality.sh
@@ -140,7 +140,7 @@ function personality_modules
# Running with threads>1 seems to trigger some problem in the build, but
since we
# spend 80+% of the time in phoenix-core, it wouldn't help much anyway
- extra="--threads=1 -DPhoenixPatchProcess"
+ extra="--threads=1 -DPhoenixPatchProcess -Dskip.embedded"
if [[ "${PATCH_BRANCH}" = 4* ]]; then
extra="${extra} -Dhttps.protocols=TLSv1.2"
fi
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 099ac03..0a88f97 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -49,7 +49,7 @@
ln
-
${project.basedir}/../phoenix-client/target
+
${project.basedir}/../phoenix-client-parent/phoenix-client/target
-fnsv
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml
b/phoenix-assembly/src/build/components/all-common-jars.xml
index 8f97784..93f82f2 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -24,11 +24,10 @@
- ${project.basedir}/../phoenix-client/target
+
${project.basedir}/../phoenix-client-parent/phoenix-client/target
/
phoenix-client-${project.version}.jar
-phoenix-client.jar
@@ -36,7 +35,6 @@
/
phoenix-server-${project.version}.jar
-phoenix-server.jar
diff --git a/phoenix-client-parent/phoenix-client-embedded/pom.xml
b/phoenix-client-parent/phoenix-client-embedded/pom.xml
new file mode 100644
index 000..bd85027
--- /dev/null
+++ b/phoenix-client-parent/phoenix-client-embedded/pom.xml
@@ -0,0 +1,66 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+ 4.0.0
+
+org.apache.phoenix
+phoenix-client-parent
+5.1.0-SNAPSHOT
+
+ phoenix-client-embedded
+ Phoenix Client Embedded
+ Phoenix Client without logging implementation
+ jar
+
+
+
+
+org.apache.maven.plugins
+maven-shade-plugin
+
+
+embedded-shaded
+package
+
+ shade
+
+
+
true
+ false
+ true
+
${basedir}/target/pom.xml
+
+
+ *:*
+
+
+ org.apache.phoenix:phoenix-client
+ xom:xom
+ org.slf4j:slf4j-log4j12
+
+
+
+
+
+
+
+
+
+
diff --git a/phoenix-client-parent/phoenix-client/pom.xml
b/phoenix-client-parent/phoenix-client/pom.xml
new file mode 100644
index 000..4781c3f
--- /dev/null
+++
Apache-Phoenix | master | HBase 2.2 | Build #72 SUCCESS
master branch HBase 2.2 build #72 status SUCCESS Build #72 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/72/
Apache-Phoenix | master | HBase 2.1 | Build #72 SUCCESS
master branch HBase 2.1 build #72 status SUCCESS Build #72 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/72/
[phoenix] branch master updated: PHOENIX-6195 : Import guava libs from phoenix thirdparty
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 5b58d9b PHOENIX-6195 : Import guava libs from phoenix thirdparty
5b58d9b is described below
commit 5b58d9b08389fd34da440a2cbc345612d63da89d
Author: Viraj Jasani
AuthorDate: Mon Oct 19 17:11:28 2020 +0530
PHOENIX-6195 : Import guava libs from phoenix thirdparty
---
.../org/apache/phoenix/coprocessor/GlobalIndexRegionScanner.java | 7 ---
.../org/apache/phoenix/coprocessor/IndexRepairRegionScanner.java | 3 +--
.../org/apache/phoenix/index/IndexRebuildRegionScannerTest.java| 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GlobalIndexRegionScanner.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GlobalIndexRegionScanner.java
index c9b01de..9c62245 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GlobalIndexRegionScanner.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GlobalIndexRegionScanner.java
@@ -17,9 +17,6 @@
*/
package org.apache.phoenix.coprocessor;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
@@ -67,6 +64,9 @@ import
org.apache.phoenix.mapreduce.index.IndexVerificationResultRepository;
import org.apache.phoenix.query.KeyRange;
import org.apache.phoenix.query.QueryServicesOptions;
import org.apache.phoenix.schema.types.PVarbinary;
+import
org.apache.phoenix.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+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.ServerUtil;
@@ -329,6 +329,7 @@ public abstract class GlobalIndexRegionScanner extends
BaseRegionScanner {
byte[] qualifier = CellUtil.cloneQualifier(cell);
return set.contains(qualifier);
}
+
@VisibleForTesting
public boolean shouldVerify(IndexTool.IndexVerifyType verifyType,
byte[] indexRowKey, Scan scan, Region region,
IndexMaintainer indexMaintainer,
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/IndexRepairRegionScanner.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/IndexRepairRegionScanner.java
index 5e916e2..6d3d38d 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/IndexRepairRegionScanner.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/IndexRepairRegionScanner.java
@@ -46,6 +46,7 @@ import org.apache.hadoop.hbase.regionserver.Region;
import org.apache.hadoop.hbase.regionserver.RegionScanner;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.query.HBaseFactoryProvider;
+import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.compile.ScanRanges;
import org.apache.phoenix.filter.SkipScanFilter;
@@ -61,8 +62,6 @@ import org.apache.phoenix.util.ServerUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Maps;
-
/**
* This is an index table region scanner which scans index table rows locally
and then extracts data table row keys
* from them. Using the data table row keys, the data table rows are scanned
using the HBase client available to
diff --git
a/phoenix-core/src/test/java/org/apache/phoenix/index/IndexRebuildRegionScannerTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/index/IndexRebuildRegionScannerTest.java
index a4901f5..c59522c 100644
---
a/phoenix-core/src/test/java/org/apache/phoenix/index/IndexRebuildRegionScannerTest.java
+++
b/phoenix-core/src/test/java/org/apache/phoenix/index/IndexRebuildRegionScannerTest.java
@@ -17,9 +17,9 @@
*/
package org.apache.phoenix.index;
-import com.google.common.collect.Maps;
import org.apache.hadoop.hbase.client.Mutation;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.junit.Assert;
import org.junit.Test;
import java.util.List;
Apache-Phoenix | 4.x | HBase 1.3 | Build #58 ABORTED
4.x branch HBase 1.3 build #58 status ABORTED Build #58 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/4.x/58/
Apache-Phoenix | master | HBase 2.2 | Build #71 FAILURE
master branch HBase 2.2 build #71 status FAILURE Build #71 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/71/
Apache-Phoenix | master | HBase 2.1 | Build #71 FAILURE
master branch HBase 2.1 build #71 status FAILURE Build #71 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/71/
Apache-Phoenix-Connectors | Build #20 SUCCESS
build #20 status SUCCESS Build #20 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-connectors/20/
