Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 d9d235402 -> d11f8d71e
PHOENIX-4361: Remove redundant argument in separateAndValidateProperties in CQSI Signed-off-by: aertoria <casti...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d11f8d71 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d11f8d71 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d11f8d71 Branch: refs/heads/4.x-HBase-0.98 Commit: d11f8d71ed1bd9207b9ece5268cedd3cc58780fb Parents: d9d2354 Author: Chinmay Kulkarni <chinmayskulka...@gmail.com> Authored: Wed Nov 15 18:31:20 2017 -0800 Committer: aertoria <casti...@gmail.com> Committed: Fri Nov 17 11:33:32 2017 -0800 ---------------------------------------------------------------------- .../org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d11f8d71/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java ---------------------------------------------------------------------- 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 7f03239..bc30161 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 @@ -1718,7 +1718,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement Set<HTableDescriptor> tableDescriptors = Collections.emptySet(); Set<HTableDescriptor> origTableDescriptors = Collections.emptySet(); boolean nonTxToTx = false; - Pair<HTableDescriptor,HTableDescriptor> tableDescriptorPair = separateAndValidateProperties(table, stmtProperties, colFamiliesForPColumnsToBeAdded, families, tableProps); + Pair<HTableDescriptor,HTableDescriptor> tableDescriptorPair = separateAndValidateProperties(table, stmtProperties, colFamiliesForPColumnsToBeAdded, tableProps); HTableDescriptor tableDescriptor = tableDescriptorPair.getSecond(); HTableDescriptor origTableDescriptor = tableDescriptorPair.getFirst(); if (tableDescriptor != null) { @@ -1936,7 +1936,8 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement this.addCoprocessors(tableDescriptor.getName(), tableDescriptor, tableType, tableProps); } - private Pair<HTableDescriptor,HTableDescriptor> separateAndValidateProperties(PTable table, Map<String, List<Pair<String, Object>>> properties, Set<String> colFamiliesForPColumnsToBeAdded, List<Pair<byte[], Map<String, Object>>> families, Map<String, Object> tableProps) throws SQLException { + private Pair<HTableDescriptor,HTableDescriptor> separateAndValidateProperties(PTable table, Map<String, List<Pair<String, Object>>> properties, + Set<String> colFamiliesForPColumnsToBeAdded, Map<String, Object> tableProps) throws SQLException { Map<String, Map<String, Object>> stmtFamiliesPropsMap = new HashMap<>(properties.size()); Map<String,Object> commonFamilyProps = new HashMap<>(); boolean addingColumns = colFamiliesForPColumnsToBeAdded != null && !colFamiliesForPColumnsToBeAdded.isEmpty();
