This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new b17e39c454 PHOENIX-6588 Update to phoenix-thirdparty 2.0.0
b17e39c454 is described below
commit b17e39c454321671180f2c4f35994c77d96c6058
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Nov 8 10:56:03 2021 +0100
PHOENIX-6588 Update to phoenix-thirdparty 2.0.0
---
.../main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java | 5 ++++-
.../src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java | 5 ++++-
.../src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java | 5 ++++-
.../java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java | 5 ++++-
.../src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java | 5 ++++-
.../java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java | 5 ++++-
.../java/org/apache/phoenix/schema/stats/UpdateStatisticsTool.java | 5 ++++-
.../src/main/java/org/apache/phoenix/schema/tool/SchemaTool.java | 5 ++++-
.../java/org/apache/phoenix/util/MergeViewIndexIdSequencesTool.java | 5 ++++-
.../src/main/java/org/apache/phoenix/util/PhoenixRuntime.java | 5 ++++-
phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java | 5 ++++-
pom.xml | 2 +-
12 files changed, 45 insertions(+), 12 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index 05a4116e81..00eff12caf 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -128,7 +128,10 @@ public abstract class AbstractBulkLoadTool extends
Configured implements Tool {
Options options = getOptions();
- CommandLineParser parser = new DefaultParser(false, false);
+ CommandLineParser parser = DefaultParser.builder().
+ setAllowPartialMatching(false).
+ setStripLeadingAndTrailingQuotes(false).
+ build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
index f16982269f..efa57d7e04 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
@@ -199,7 +199,10 @@ public class OrphanViewTool extends Configured implements
Tool {
final Options options = getOptions();
- CommandLineParser parser = new DefaultParser(false, false);
+ CommandLineParser parser = DefaultParser.builder().
+ setAllowPartialMatching(false).
+ setStripLeadingAndTrailingQuotes(false).
+ build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
index 0f432640b0..b8d6b8a326 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
@@ -173,7 +173,10 @@ public class PhoenixTTLTool extends Configured implements
Tool {
public CommandLine parseOptions(String[] args) {
final Options options = getOptions();
- CommandLineParser parser = new DefaultParser(false, false);
+ CommandLineParser parser = DefaultParser.builder().
+ setAllowPartialMatching(false).
+ setStripLeadingAndTrailingQuotes(false).
+ build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
index 1f775d6370..420027134c 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
@@ -170,7 +170,10 @@ public class IndexScrutinyTool extends Configured
implements Tool {
private CommandLine parseOptions(String[] args) {
final Options options = getOptions();
- CommandLineParser parser = new DefaultParser(false, false);
+ CommandLineParser parser = DefaultParser.builder().
+ setAllowPartialMatching(false).
+ setStripLeadingAndTrailingQuotes(false).
+ build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
index 5d83801a33..f5b41c7e3e 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java
@@ -353,7 +353,10 @@ public class IndexTool extends Configured implements Tool {
final Options options = getOptions();
- CommandLineParser parser = new DefaultParser(false, false);
+ CommandLineParser parser = DefaultParser.builder().
+ setAllowPartialMatching(false).
+ setStripLeadingAndTrailingQuotes(false).
+ build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java
index f42d7056bc..11597f87e3 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java
@@ -229,7 +229,10 @@ public class IndexUpgradeTool extends Configured
implements Tool {
final Options options = getOptions();
- CommandLineParser parser = new DefaultParser(false, false);
+ CommandLineParser parser = DefaultParser.builder().
+ setAllowPartialMatching(false).
+ setStripLeadingAndTrailingQuotes(false).
+ build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/UpdateStatisticsTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/UpdateStatisticsTool.java
index 1c8da9606a..e3f7d9aec4 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/UpdateStatisticsTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/UpdateStatisticsTool.java
@@ -268,7 +268,10 @@ public class UpdateStatisticsTool extends Configured
implements Tool {
final Options options = getOptions();
- CommandLineParser parser = new DefaultParser(false, false);
+ CommandLineParser parser = DefaultParser.builder().
+ setAllowPartialMatching(false).
+ setStripLeadingAndTrailingQuotes(false).
+ build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaTool.java
index bacbc7c91e..6bc4922f90 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaTool.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaTool.java
@@ -103,7 +103,10 @@ public class SchemaTool extends Configured implements Tool
{
justification="null path call calls System.exit()")
private CommandLine parseOptions(String[] args) {
final Options options = getOptions();
- CommandLineParser parser = new DefaultParser(false, false);
+ CommandLineParser parser = DefaultParser.builder().
+ setAllowPartialMatching(false).
+ setStripLeadingAndTrailingQuotes(false).
+ build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/util/MergeViewIndexIdSequencesTool.java
b/phoenix-core/src/main/java/org/apache/phoenix/util/MergeViewIndexIdSequencesTool.java
index 3a15432339..0bb0fb8549 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/util/MergeViewIndexIdSequencesTool.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/util/MergeViewIndexIdSequencesTool.java
@@ -55,7 +55,10 @@ public class MergeViewIndexIdSequencesTool extends
Configured implements Tool {
final Options options = getOptions();
- CommandLineParser parser = new DefaultParser(false, false);
+ CommandLineParser parser = DefaultParser.builder().
+ setAllowPartialMatching(false).
+ setStripLeadingAndTrailingQuotes(false).
+ build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
index 78489f33f7..30669cbc0c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
@@ -718,7 +718,10 @@ public class PhoenixRuntime {
options.addOption(localIndexUpgradeOption);
options.addOption(binaryEncodingOption);
- CommandLineParser parser = new DefaultParser(false, false);
+ CommandLineParser parser = DefaultParser.builder().
+ setAllowPartialMatching(false).
+ setStripLeadingAndTrailingQuotes(false).
+ build();
CommandLine cmdLine = null;
try {
cmdLine = parser.parse(options, args);
diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
index e6aa688445..341a94df7b 100644
--- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
+++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java
@@ -140,7 +140,10 @@ public class Pherf {
}
public Pherf(String[] args) throws Exception {
- CommandLineParser parser = new DefaultParser(false, false);
+ CommandLineParser parser = DefaultParser.builder().
+ setAllowPartialMatching(false).
+ setStripLeadingAndTrailingQuotes(false).
+ build();
CommandLine command = null;
HelpFormatter hf = new HelpFormatter();
diff --git a/pom.xml b/pom.xml
index 479322d4fe..dd5aebf1bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
<hadoop.version>3.1.4</hadoop.version>
<hbase.thirdparty.version>2.2.1</hbase.thirdparty.version>
- <phoenix.thirdparty.version>1.1.0</phoenix.thirdparty.version>
+ <phoenix.thirdparty.version>2.0.0</phoenix.thirdparty.version>
<hbase.suffix>hbase-${hbase.profile}</hbase.suffix>
<!-- This is used by the release script only -->
