You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sk...@apache.org on 2021/06/15 18:41:20 UTC
[phoenix] branch 4.x updated: PHOENIX-6480 Move phoenix-tool and
add support with generating default properties (#1245)
This is an automated email from the ASF dual-hosted git repository.
skadam 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 3836a91 PHOENIX-6480 Move phoenix-tool and add support with generating default properties (#1245)
3836a91 is described below
commit 3836a915721f532f7671f1c3baa595010267aed2
Author: Gokcen Iskender <47...@users.noreply.github.com>
AuthorDate: Tue Jun 15 11:41:07 2021 -0700
PHOENIX-6480 Move phoenix-tool and add support with generating default properties (#1245)
---
.../schema/tool}/SchemaToolExtractionIT.java | 34 ++++++-
.../schema/tool}/SchemaToolSynthesisIT.java | 8 +-
.../it/resources/synthesis/alter_add_property.sql | 0
.../resources/synthesis/alter_change_property.sql | 0
.../synthesis/alter_index_add_property.sql | 0
.../synthesis/alter_index_change_property.sql | 0
.../src/it/resources/synthesis/alter_table_add.sql | 0
.../it/resources/synthesis/alter_table_add_pk.sql | 0
.../it/resources/synthesis/alter_table_drop.sql | 0
.../resources/synthesis/alter_table_multiple.sql | 0
.../src/it/resources/synthesis/alter_view_add.sql | 0
.../src/it/resources/synthesis/alter_view_drop.sql | 0
.../src/it/resources/synthesis/create_function.sql | 0
.../it/resources/synthesis/drop_create_table.sql | 0
.../src/it/resources/synthesis/drop_index.sql | 0
.../src/it/resources/synthesis/drop_table.sql | 0
.../resources/synthesis/mismatched_entity_name.sql | 0
.../schema/tool}/SchemaExtractionProcessor.java | 34 +++++--
.../phoenix/schema/tool}/SchemaProcessor.java | 2 +-
.../apache/phoenix/schema/tool}/SchemaSQLUtil.java | 4 +-
.../schema/tool}/SchemaSynthesisProcessor.java | 7 +-
.../apache/phoenix/schema/tool}/SchemaTool.java | 2 +-
phoenix-tools/pom.xml | 106 ---------------------
pom.xml | 6 --
24 files changed, 74 insertions(+), 129 deletions(-)
diff --git a/phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaToolExtractionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java
similarity index 92%
rename from phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaToolExtractionIT.java
rename to phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java
index ff19873..89bd53a 100644
--- a/phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaToolExtractionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java
@@ -15,12 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.phoenix.schema;
+package org.apache.phoenix.schema.tool;
import org.apache.phoenix.end2end.ParallelStatsEnabledIT;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.parse.ParseException;
import org.apache.phoenix.parse.SQLParser;
+import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
@@ -43,6 +44,8 @@ import java.util.HashSet;
import java.util.Arrays;
import java.util.Properties;
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertTrue;
import static junit.framework.TestCase.fail;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
@@ -92,6 +95,35 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT {
}
@Test
+ public void testDDLsWithDefaults() throws Exception {
+ Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+ String tableName = generateUniqueName();
+ String schemaName = generateUniqueName();
+ String indexName = generateUniqueName();
+ String properties = "COLUMN_ENCODED_BYTES=4";
+ String pTableFullName = SchemaUtil.getQualifiedTableName(schemaName, tableName);
+ String pIndexFullName = SchemaUtil.getQualifiedTableName(schemaName, indexName);
+ String createTableStatement = "CREATE TABLE "+pTableFullName + "(k VARCHAR NOT NULL PRIMARY KEY, v1 VARCHAR, v2 VARCHAR)";
+ String createIndexStatement = "CREATE INDEX "+indexName + " ON "+pTableFullName+"(v1 DESC) INCLUDE (v2)" + properties;
+
+ List<String> queries = new ArrayList<String>(){};
+ queries.add(createTableStatement);
+ queries.add(createIndexStatement);
+ try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
+ executeCreateStatements(conn, queries);
+ PTable pData = PhoenixRuntime.getTable(conn, pTableFullName);
+ PTable pIndex = PhoenixRuntime.getTable(conn, pIndexFullName);
+ SchemaExtractionProcessor schemaExtractionProcessor = new SchemaExtractionProcessor(null, config, pData, true);
+ String tableDDL = schemaExtractionProcessor.process();
+ assertTrue(tableDDL.contains("IMMUTABLE_STORAGE_SCHEME"));
+ SchemaExtractionProcessor schemaExtractionProcessorIndex = new SchemaExtractionProcessor(null, config, pIndex, true);
+ String indexDDL = schemaExtractionProcessorIndex.process();
+ assertTrue(indexDDL.contains("IMMUTABLE_STORAGE_SCHEME"));
+ assertTrue(indexDDL.contains("ENCODING_SCHEME='FOUR_BYTE_QUALIFIERS'"));
+ }
+ }
+
+ @Test
public void testCreateViewStatement() throws Exception {
String tableName = generateUniqueName();
String schemaName = generateUniqueName();
diff --git a/phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaToolSynthesisIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolSynthesisIT.java
similarity index 96%
rename from phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaToolSynthesisIT.java
rename to phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolSynthesisIT.java
index b44db32..9a64601 100644
--- a/phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaToolSynthesisIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolSynthesisIT.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.phoenix.schema;
+package org.apache.phoenix.schema.tool;
import org.junit.Assert;
import org.junit.Test;
@@ -23,9 +23,9 @@ import org.junit.Test;
import java.io.File;
import java.net.URL;
-import static org.apache.phoenix.schema.SchemaSynthesisProcessor.ENTITY_NAME_IN_BASE_AND_ALTER_DDL_DON_T_MATCH;
-import static org.apache.phoenix.schema.SchemaSynthesisProcessor.UNSUPPORTED_DDL_EXCEPTION;
-import static org.apache.phoenix.schema.SchemaToolExtractionIT.runSchemaTool;
+import static org.apache.phoenix.schema.tool.SchemaSynthesisProcessor.ENTITY_NAME_IN_BASE_AND_ALTER_DDL_DON_T_MATCH;
+import static org.apache.phoenix.schema.tool.SchemaSynthesisProcessor.UNSUPPORTED_DDL_EXCEPTION;
+import static org.apache.phoenix.schema.tool.SchemaToolExtractionIT.runSchemaTool;
public class SchemaToolSynthesisIT {
diff --git a/phoenix-tools/src/it/resources/synthesis/alter_add_property.sql b/phoenix-core/src/it/resources/synthesis/alter_add_property.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/alter_add_property.sql
rename to phoenix-core/src/it/resources/synthesis/alter_add_property.sql
diff --git a/phoenix-tools/src/it/resources/synthesis/alter_change_property.sql b/phoenix-core/src/it/resources/synthesis/alter_change_property.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/alter_change_property.sql
rename to phoenix-core/src/it/resources/synthesis/alter_change_property.sql
diff --git a/phoenix-tools/src/it/resources/synthesis/alter_index_add_property.sql b/phoenix-core/src/it/resources/synthesis/alter_index_add_property.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/alter_index_add_property.sql
rename to phoenix-core/src/it/resources/synthesis/alter_index_add_property.sql
diff --git a/phoenix-tools/src/it/resources/synthesis/alter_index_change_property.sql b/phoenix-core/src/it/resources/synthesis/alter_index_change_property.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/alter_index_change_property.sql
rename to phoenix-core/src/it/resources/synthesis/alter_index_change_property.sql
diff --git a/phoenix-tools/src/it/resources/synthesis/alter_table_add.sql b/phoenix-core/src/it/resources/synthesis/alter_table_add.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/alter_table_add.sql
rename to phoenix-core/src/it/resources/synthesis/alter_table_add.sql
diff --git a/phoenix-tools/src/it/resources/synthesis/alter_table_add_pk.sql b/phoenix-core/src/it/resources/synthesis/alter_table_add_pk.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/alter_table_add_pk.sql
rename to phoenix-core/src/it/resources/synthesis/alter_table_add_pk.sql
diff --git a/phoenix-tools/src/it/resources/synthesis/alter_table_drop.sql b/phoenix-core/src/it/resources/synthesis/alter_table_drop.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/alter_table_drop.sql
rename to phoenix-core/src/it/resources/synthesis/alter_table_drop.sql
diff --git a/phoenix-tools/src/it/resources/synthesis/alter_table_multiple.sql b/phoenix-core/src/it/resources/synthesis/alter_table_multiple.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/alter_table_multiple.sql
rename to phoenix-core/src/it/resources/synthesis/alter_table_multiple.sql
diff --git a/phoenix-tools/src/it/resources/synthesis/alter_view_add.sql b/phoenix-core/src/it/resources/synthesis/alter_view_add.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/alter_view_add.sql
rename to phoenix-core/src/it/resources/synthesis/alter_view_add.sql
diff --git a/phoenix-tools/src/it/resources/synthesis/alter_view_drop.sql b/phoenix-core/src/it/resources/synthesis/alter_view_drop.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/alter_view_drop.sql
rename to phoenix-core/src/it/resources/synthesis/alter_view_drop.sql
diff --git a/phoenix-tools/src/it/resources/synthesis/create_function.sql b/phoenix-core/src/it/resources/synthesis/create_function.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/create_function.sql
rename to phoenix-core/src/it/resources/synthesis/create_function.sql
diff --git a/phoenix-tools/src/it/resources/synthesis/drop_create_table.sql b/phoenix-core/src/it/resources/synthesis/drop_create_table.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/drop_create_table.sql
rename to phoenix-core/src/it/resources/synthesis/drop_create_table.sql
diff --git a/phoenix-tools/src/it/resources/synthesis/drop_index.sql b/phoenix-core/src/it/resources/synthesis/drop_index.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/drop_index.sql
rename to phoenix-core/src/it/resources/synthesis/drop_index.sql
diff --git a/phoenix-tools/src/it/resources/synthesis/drop_table.sql b/phoenix-core/src/it/resources/synthesis/drop_table.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/drop_table.sql
rename to phoenix-core/src/it/resources/synthesis/drop_table.sql
diff --git a/phoenix-tools/src/it/resources/synthesis/mismatched_entity_name.sql b/phoenix-core/src/it/resources/synthesis/mismatched_entity_name.sql
similarity index 100%
rename from phoenix-tools/src/it/resources/synthesis/mismatched_entity_name.sql
rename to phoenix-core/src/it/resources/synthesis/mismatched_entity_name.sql
diff --git a/phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaExtractionProcessor.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaExtractionProcessor.java
similarity index 94%
rename from phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaExtractionProcessor.java
rename to phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaExtractionProcessor.java
index 7c05250..bf6faf9 100644
--- a/phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaExtractionProcessor.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaExtractionProcessor.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.phoenix.schema;
+package org.apache.phoenix.schema.tool;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HColumnDescriptor;
@@ -28,6 +28,10 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.mapreduce.util.ConnectionUtil;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.QueryConstants;
+import org.apache.phoenix.schema.PColumn;
+import org.apache.phoenix.schema.PTable;
+import org.apache.phoenix.schema.PTableType;
+import org.apache.phoenix.schema.SortOrder;
import org.apache.phoenix.util.MetaDataUtil;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.SchemaUtil;
@@ -57,6 +61,7 @@ public class SchemaExtractionProcessor implements SchemaProcessor {
private Configuration conf;
private String ddl = null;
private String tenantId;
+ private boolean shouldGenerateWithDefaults = false;
public SchemaExtractionProcessor(String tenantId, Configuration conf,
String pSchemaName, String pTableName)
@@ -66,6 +71,15 @@ public class SchemaExtractionProcessor implements SchemaProcessor {
this.table = getPTable(pSchemaName, pTableName);
}
+ public SchemaExtractionProcessor(String tenantId, Configuration conf,
+ PTable pTable, boolean shouldGenerateWithDefaults)
+ throws SQLException {
+ this.tenantId = tenantId;
+ this.conf = conf;
+ this.table = pTable;
+ this.shouldGenerateWithDefaults = shouldGenerateWithDefaults;
+ }
+
@Override
public String process() throws Exception {
if (ddl != null) {
@@ -82,7 +96,7 @@ public class SchemaExtractionProcessor implements SchemaProcessor {
}
protected String extractCreateIndexDDL(PTable indexPTable)
- throws SQLException {
+ throws SQLException, IOException {
String pTableName = indexPTable.getTableName().getString();
String baseTableName = indexPTable.getParentTableName().getString();
@@ -93,9 +107,16 @@ public class SchemaExtractionProcessor implements SchemaProcessor {
String defaultCF = SchemaUtil.getEmptyColumnFamilyAsString(indexPTable);
String indexedColumnsString = getIndexedColumnsString(indexPTable, dataPTable, defaultCF);
String coveredColumnsString = getCoveredColumnsString(indexPTable, defaultCF);
-
+ if (shouldGenerateWithDefaults) {
+ populateDefaultProperties(indexPTable);
+ setPTableProperties(indexPTable);
+ ConnectionQueryServices cqsi = getCQSIObject();
+ HTableDescriptor htd = getTableDescriptor(cqsi, table);
+ setHTableProperties(htd);
+ }
+ String propertiesString = convertPropertiesToString();
return generateIndexDDLString(baseTableFullName, indexedColumnsString, coveredColumnsString,
- indexPTable.getIndexType().equals(PTable.IndexType.LOCAL), pTableName);
+ indexPTable.getIndexType().equals(PTable.IndexType.LOCAL), pTableName, propertiesString);
}
//TODO: Indexed on an expression
@@ -184,7 +205,7 @@ public class SchemaExtractionProcessor implements SchemaProcessor {
}
protected String generateIndexDDLString(String baseTableFullName, String indexedColumnString,
- String coveredColumnString, boolean local, String pTableName) {
+ String coveredColumnString, boolean local, String pTableName, String properties) {
StringBuilder outputBuilder = new StringBuilder(String.format(CREATE_INDEX,
local ? "LOCAL " : "", pTableName, baseTableFullName));
outputBuilder.append("(");
@@ -195,6 +216,7 @@ public class SchemaExtractionProcessor implements SchemaProcessor {
outputBuilder.append(coveredColumnString);
outputBuilder.append(")");
}
+ outputBuilder.append(properties);
return outputBuilder.toString();
}
@@ -345,7 +367,7 @@ public class SchemaExtractionProcessor implements SchemaProcessor {
key = colPropKey[1];
}
- if(value!=null && defaultProps.get(key) != null && !value.equals(defaultProps.get(key))) {
+ if(value!=null && (shouldGenerateWithDefaults || (defaultProps.get(key) != null && !value.equals(defaultProps.get(key))))) {
if (optionBuilder.length() != 0) {
optionBuilder.append(", ");
}
diff --git a/phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaProcessor.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaProcessor.java
similarity index 95%
rename from phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaProcessor.java
rename to phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaProcessor.java
index f0bc8ae..babd952 100644
--- a/phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaProcessor.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaProcessor.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.phoenix.schema;
+package org.apache.phoenix.schema.tool;
public interface SchemaProcessor {
String process() throws Exception;
diff --git a/phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaSQLUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaSQLUtil.java
similarity index 98%
rename from phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaSQLUtil.java
rename to phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaSQLUtil.java
index ed1bae7..b20dc6d 100644
--- a/phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaSQLUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaSQLUtil.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.phoenix.schema;
+package org.apache.phoenix.schema.tool;
import com.google.common.collect.ListMultimap;
import org.apache.hadoop.hbase.util.Pair;
@@ -23,6 +23,8 @@ import org.apache.phoenix.parse.ColumnDef;
import org.apache.phoenix.parse.ColumnName;
import org.apache.phoenix.parse.CreateIndexStatement;
import org.apache.phoenix.parse.CreateTableStatement;
+import org.apache.phoenix.schema.PTable;
+import org.apache.phoenix.schema.PTableType;
import java.util.List;
import java.util.Map;
diff --git a/phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaSynthesisProcessor.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaSynthesisProcessor.java
similarity index 97%
rename from phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaSynthesisProcessor.java
rename to phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaSynthesisProcessor.java
index 1d74f27..4caae60 100644
--- a/phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaSynthesisProcessor.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaSynthesisProcessor.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.phoenix.schema;
+package org.apache.phoenix.schema.tool;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
@@ -32,6 +32,7 @@ import org.apache.phoenix.parse.DropIndexStatement;
import org.apache.phoenix.parse.DropTableStatement;
import org.apache.phoenix.parse.PrimaryKeyConstraint;
import org.apache.phoenix.parse.SQLParser;
+import org.apache.phoenix.schema.SortOrder;
import java.io.BufferedReader;
import java.io.File;
@@ -42,8 +43,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.apache.phoenix.schema.SchemaSQLUtil.getCreateIndexSQL;
-import static org.apache.phoenix.schema.SchemaSQLUtil.getCreateTableSQL;
+import static org.apache.phoenix.schema.tool.SchemaSQLUtil.getCreateIndexSQL;
+import static org.apache.phoenix.schema.tool.SchemaSQLUtil.getCreateTableSQL;
public class SchemaSynthesisProcessor implements SchemaProcessor {
public static final String
diff --git a/phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaTool.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaTool.java
similarity index 99%
rename from phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaTool.java
rename to phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaTool.java
index 9b3c343..e1f9e06 100644
--- a/phoenix-tools/src/main/java/org/apache/phoenix/schema/SchemaTool.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/tool/SchemaTool.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.phoenix.schema;
+package org.apache.phoenix.schema.tool;
import org.apache.hadoop.yarn.webapp.hamlet.HamletSpec;
import org.apache.phoenix.thirdparty.org.apache.commons.cli.CommandLine;
diff --git a/phoenix-tools/pom.xml b/phoenix-tools/pom.xml
deleted file mode 100644
index b073565..0000000
--- a/phoenix-tools/pom.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="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">
- <parent>
- <artifactId>phoenix</artifactId>
- <groupId>org.apache.phoenix</groupId>
- <version>4.17.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>phoenix-tools</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix.thirdparty</groupId>
- <artifactId>phoenix-shaded-commons-cli</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
- <optional>false</optional>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-it</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 86a50c1..3d06e58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,6 @@
<!-- phoenix-client-embedded is added in profile "embedded" -->
<module>phoenix-server</module>
<module>phoenix-assembly</module>
- <module>phoenix-tools</module>
<module>phoenix-tracing-webapp</module>
</modules>
@@ -633,11 +632,6 @@
</dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-tools</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-tracing-webapp</artifactId>
<version>${project.version}</version>
</dependency>