[19/35] phoenix git commit: PHOENIX-4386 Calculate the estimatedSize of MutationState using Map<TableRef, Map<ImmutableBytesPtr, RowMutationState>> mutations (addendum)
PHOENIX-4386 Calculate the estimatedSize of MutationState using Map> mutations (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/310b38c5 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/310b38c5 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/310b38c5 Branch: refs/heads/4.x-cdh5.11.2 Commit: 310b38c5ab7d67b5852e20c021c7bb2508803b96 Parents: d5bc5ce Author: Thomas D'Silva Authored: Tue Nov 21 03:13:53 2017 + Committer: Pedro Boado Committed: Wed Jan 31 22:24:48 2018 + -- .../apache/phoenix/execute/PartialCommitIT.java | 5 +- .../apache/phoenix/compile/DeleteCompiler.java | 11 +- .../apache/phoenix/compile/UpsertCompiler.java | 7 +- .../apache/phoenix/execute/MutationState.java | 127 --- .../java/org/apache/phoenix/util/IndexUtil.java | 4 +- .../org/apache/phoenix/util/KeyValueUtil.java | 5 +- 6 files changed, 98 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/310b38c5/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java index 10fd7f8..e5b57e3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java @@ -33,7 +33,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -52,8 +51,8 @@ import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseOwnClusterIT; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.hbase.index.Indexer; -import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.monitoring.GlobalMetric; import org.apache.phoenix.monitoring.MetricType; @@ -285,7 +284,7 @@ public class PartialCommitIT extends BaseOwnClusterIT { private PhoenixConnection getConnectionWithTableOrderPreservingMutationState() throws SQLException { Connection con = driver.connect(url, new Properties()); PhoenixConnection phxCon = new PhoenixConnection(con.unwrap(PhoenixConnection.class)); -final Map > mutations = Maps.newTreeMap(new TableRefComparator()); +final Map mutations = Maps.newTreeMap(new TableRefComparator()); // passing a null mutation state forces the connection.newMutationState() to be used to create the MutationState return new PhoenixConnection(phxCon, null) { @Override http://git-wip-us.apache.org/repos/asf/phoenix/blob/310b38c5/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java index f9ca300..a06e2ca 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.hadoop.hbase.Cell; @@ -43,6 +42,7 @@ import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; import org.apache.phoenix.execute.AggregatePlan; import org.apache.phoenix.execute.MutationState; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.execute.MutationState.RowMutationState; import org.apache.phoenix.filter.SkipScanFilter; import org.apache.phoenix.hbase.index.ValueGetter; @@ -91,7 +91,6 @@ import org.apache.phoenix.util.ScanUtil; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.sun.istack.NotNull; public class DeleteCompiler { @@ -121,14 +120,14 @@ public class DeleteCompiler { final int maxSize =
[5/6] phoenix git commit: PHOENIX-4386 Calculate the estimatedSize of MutationState using Map<TableRef, Map<ImmutableBytesPtr, RowMutationState>> mutations (addendum)
PHOENIX-4386 Calculate the estimatedSize of MutationState using Map> mutations (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1184f965 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1184f965 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1184f965 Branch: refs/heads/4.x-HBase-1.1 Commit: 1184f96523d4c49ab2a53900b2641653f4dc7dc5 Parents: 08cb37a Author: Thomas D'Silva Authored: Mon Nov 20 19:13:53 2017 -0800 Committer: James Taylor Committed: Mon Jan 22 12:33:32 2018 -0800 -- .../apache/phoenix/execute/PartialCommitIT.java | 5 +- .../apache/phoenix/compile/DeleteCompiler.java | 11 +- .../apache/phoenix/compile/UpsertCompiler.java | 7 +- .../apache/phoenix/execute/MutationState.java | 127 --- .../java/org/apache/phoenix/util/IndexUtil.java | 4 +- .../org/apache/phoenix/util/KeyValueUtil.java | 5 +- 6 files changed, 98 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/1184f965/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java index 10fd7f8..e5b57e3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java @@ -33,7 +33,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -52,8 +51,8 @@ import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseOwnClusterIT; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.hbase.index.Indexer; -import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.monitoring.GlobalMetric; import org.apache.phoenix.monitoring.MetricType; @@ -285,7 +284,7 @@ public class PartialCommitIT extends BaseOwnClusterIT { private PhoenixConnection getConnectionWithTableOrderPreservingMutationState() throws SQLException { Connection con = driver.connect(url, new Properties()); PhoenixConnection phxCon = new PhoenixConnection(con.unwrap(PhoenixConnection.class)); -final Map > mutations = Maps.newTreeMap(new TableRefComparator()); +final Map mutations = Maps.newTreeMap(new TableRefComparator()); // passing a null mutation state forces the connection.newMutationState() to be used to create the MutationState return new PhoenixConnection(phxCon, null) { @Override http://git-wip-us.apache.org/repos/asf/phoenix/blob/1184f965/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java index f9ca300..a06e2ca 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.hadoop.hbase.Cell; @@ -43,6 +42,7 @@ import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; import org.apache.phoenix.execute.AggregatePlan; import org.apache.phoenix.execute.MutationState; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.execute.MutationState.RowMutationState; import org.apache.phoenix.filter.SkipScanFilter; import org.apache.phoenix.hbase.index.ValueGetter; @@ -91,7 +91,6 @@ import org.apache.phoenix.util.ScanUtil; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.sun.istack.NotNull; public class DeleteCompiler { @@ -121,14 +120,14 @@ public class DeleteCompiler { final int maxSize =
[3/6] phoenix git commit: PHOENIX-4386 Calculate the estimatedSize of MutationState using Map<TableRef, Map<ImmutableBytesPtr, RowMutationState>> mutations (addendum)
PHOENIX-4386 Calculate the estimatedSize of MutationState using Map> mutations (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/44fef414 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/44fef414 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/44fef414 Branch: refs/heads/4.x-HBase-1.1 Commit: 44fef4142b8d3a5425ac8e9d03db39fb67fe0a71 Parents: 8950ec3 Author: Thomas D'Silva Authored: Mon Nov 20 19:13:53 2017 -0800 Committer: James Taylor Committed: Mon Jan 22 12:32:47 2018 -0800 -- .../apache/phoenix/execute/PartialCommitIT.java | 5 +- .../apache/phoenix/compile/DeleteCompiler.java | 11 +- .../apache/phoenix/compile/UpsertCompiler.java | 7 +- .../apache/phoenix/execute/MutationState.java | 127 --- .../java/org/apache/phoenix/util/IndexUtil.java | 4 +- .../org/apache/phoenix/util/KeyValueUtil.java | 5 +- 6 files changed, 98 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/44fef414/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java index 10fd7f8..e5b57e3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java @@ -33,7 +33,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -52,8 +51,8 @@ import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseOwnClusterIT; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.hbase.index.Indexer; -import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.monitoring.GlobalMetric; import org.apache.phoenix.monitoring.MetricType; @@ -285,7 +284,7 @@ public class PartialCommitIT extends BaseOwnClusterIT { private PhoenixConnection getConnectionWithTableOrderPreservingMutationState() throws SQLException { Connection con = driver.connect(url, new Properties()); PhoenixConnection phxCon = new PhoenixConnection(con.unwrap(PhoenixConnection.class)); -final Map > mutations = Maps.newTreeMap(new TableRefComparator()); +final Map mutations = Maps.newTreeMap(new TableRefComparator()); // passing a null mutation state forces the connection.newMutationState() to be used to create the MutationState return new PhoenixConnection(phxCon, null) { @Override http://git-wip-us.apache.org/repos/asf/phoenix/blob/44fef414/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java index f9ca300..a06e2ca 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.hadoop.hbase.Cell; @@ -43,6 +42,7 @@ import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; import org.apache.phoenix.execute.AggregatePlan; import org.apache.phoenix.execute.MutationState; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.execute.MutationState.RowMutationState; import org.apache.phoenix.filter.SkipScanFilter; import org.apache.phoenix.hbase.index.ValueGetter; @@ -91,7 +91,6 @@ import org.apache.phoenix.util.ScanUtil; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.sun.istack.NotNull; public class DeleteCompiler { @@ -121,14 +120,14 @@ public class DeleteCompiler { final int maxSize =
[24/50] [abbrv] phoenix git commit: PHOENIX-4386 Calculate the estimatedSize of MutationState using Map<TableRef, Map<ImmutableBytesPtr, RowMutationState>> mutations (addendum)
PHOENIX-4386 Calculate the estimatedSize of MutationState using Map> mutations (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/25359a95 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/25359a95 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/25359a95 Branch: refs/heads/system-catalog Commit: 25359a95f1a8c5aa6e852e750fd6da6e10249387 Parents: 071fbce Author: Thomas D'Silva Authored: Mon Nov 20 19:13:53 2017 -0800 Committer: Thomas D'Silva Committed: Wed Dec 6 12:26:15 2017 -0800 -- .../apache/phoenix/execute/PartialCommitIT.java | 5 +- .../apache/phoenix/compile/DeleteCompiler.java | 11 +- .../apache/phoenix/compile/UpsertCompiler.java | 7 +- .../apache/phoenix/execute/MutationState.java | 127 --- .../java/org/apache/phoenix/util/IndexUtil.java | 4 +- .../org/apache/phoenix/util/KeyValueUtil.java | 5 +- 6 files changed, 98 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/25359a95/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java index 10fd7f8..e5b57e3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java @@ -33,7 +33,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -52,8 +51,8 @@ import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseOwnClusterIT; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.hbase.index.Indexer; -import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.monitoring.GlobalMetric; import org.apache.phoenix.monitoring.MetricType; @@ -285,7 +284,7 @@ public class PartialCommitIT extends BaseOwnClusterIT { private PhoenixConnection getConnectionWithTableOrderPreservingMutationState() throws SQLException { Connection con = driver.connect(url, new Properties()); PhoenixConnection phxCon = new PhoenixConnection(con.unwrap(PhoenixConnection.class)); -final Map > mutations = Maps.newTreeMap(new TableRefComparator()); +final Map mutations = Maps.newTreeMap(new TableRefComparator()); // passing a null mutation state forces the connection.newMutationState() to be used to create the MutationState return new PhoenixConnection(phxCon, null) { @Override http://git-wip-us.apache.org/repos/asf/phoenix/blob/25359a95/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java index f9ca300..a06e2ca 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.hadoop.hbase.Cell; @@ -43,6 +42,7 @@ import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; import org.apache.phoenix.execute.AggregatePlan; import org.apache.phoenix.execute.MutationState; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.execute.MutationState.RowMutationState; import org.apache.phoenix.filter.SkipScanFilter; import org.apache.phoenix.hbase.index.ValueGetter; @@ -91,7 +91,6 @@ import org.apache.phoenix.util.ScanUtil; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.sun.istack.NotNull; public class DeleteCompiler { @@ -121,14 +120,14 @@ public class DeleteCompiler { final int maxSize =
[16/50] [abbrv] phoenix git commit: PHOENIX-4386 Calculate the estimatedSize of MutationState using Map<TableRef, Map<ImmutableBytesPtr, RowMutationState>> mutations (addendum)
PHOENIX-4386 Calculate the estimatedSize of MutationState using Map> mutations (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4e0c0a33 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4e0c0a33 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4e0c0a33 Branch: refs/heads/system-catalog Commit: 4e0c0a33ed8b401f7785dde8979041dd5ab9a1f4 Parents: c216b66 Author: Thomas D'Silva Authored: Mon Nov 20 19:13:53 2017 -0800 Committer: Thomas D'Silva Committed: Tue Nov 21 12:26:13 2017 -0800 -- .../apache/phoenix/execute/PartialCommitIT.java | 5 +- .../apache/phoenix/compile/DeleteCompiler.java | 11 +- .../apache/phoenix/compile/UpsertCompiler.java | 7 +- .../apache/phoenix/execute/MutationState.java | 127 --- .../java/org/apache/phoenix/util/IndexUtil.java | 4 +- .../org/apache/phoenix/util/KeyValueUtil.java | 5 +- 6 files changed, 98 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e0c0a33/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java index 10fd7f8..e5b57e3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java @@ -33,7 +33,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -52,8 +51,8 @@ import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseOwnClusterIT; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.hbase.index.Indexer; -import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.monitoring.GlobalMetric; import org.apache.phoenix.monitoring.MetricType; @@ -285,7 +284,7 @@ public class PartialCommitIT extends BaseOwnClusterIT { private PhoenixConnection getConnectionWithTableOrderPreservingMutationState() throws SQLException { Connection con = driver.connect(url, new Properties()); PhoenixConnection phxCon = new PhoenixConnection(con.unwrap(PhoenixConnection.class)); -final Map > mutations = Maps.newTreeMap(new TableRefComparator()); +final Map mutations = Maps.newTreeMap(new TableRefComparator()); // passing a null mutation state forces the connection.newMutationState() to be used to create the MutationState return new PhoenixConnection(phxCon, null) { @Override http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e0c0a33/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java index f9ca300..a06e2ca 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.hadoop.hbase.Cell; @@ -43,6 +42,7 @@ import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; import org.apache.phoenix.execute.AggregatePlan; import org.apache.phoenix.execute.MutationState; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.execute.MutationState.RowMutationState; import org.apache.phoenix.filter.SkipScanFilter; import org.apache.phoenix.hbase.index.ValueGetter; @@ -91,7 +91,6 @@ import org.apache.phoenix.util.ScanUtil; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.sun.istack.NotNull; public class DeleteCompiler { @@ -121,14 +120,14 @@ public class DeleteCompiler { final int maxSize =
[07/16] phoenix git commit: PHOENIX-4386 Calculate the estimatedSize of MutationState using Map<TableRef, Map<ImmutableBytesPtr, RowMutationState>> mutations (addendum)
PHOENIX-4386 Calculate the estimatedSize of MutationState using Map> mutations (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/eb0f744d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/eb0f744d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/eb0f744d Branch: refs/heads/4.x-HBase-1.2 Commit: eb0f744dc1f453e559cc8f9722122f6ed8daf739 Parents: a6db039 Author: Thomas D'Silva Authored: Tue Nov 21 03:13:53 2017 + Committer: James Taylor Committed: Sat Dec 16 16:42:54 2017 -0800 -- .../apache/phoenix/execute/PartialCommitIT.java | 5 +- .../apache/phoenix/compile/DeleteCompiler.java | 11 +- .../apache/phoenix/compile/UpsertCompiler.java | 7 +- .../apache/phoenix/execute/MutationState.java | 127 --- .../java/org/apache/phoenix/util/IndexUtil.java | 4 +- .../org/apache/phoenix/util/KeyValueUtil.java | 5 +- 6 files changed, 98 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/eb0f744d/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java index 10fd7f8..e5b57e3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java @@ -33,7 +33,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -52,8 +51,8 @@ import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseOwnClusterIT; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.hbase.index.Indexer; -import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.monitoring.GlobalMetric; import org.apache.phoenix.monitoring.MetricType; @@ -285,7 +284,7 @@ public class PartialCommitIT extends BaseOwnClusterIT { private PhoenixConnection getConnectionWithTableOrderPreservingMutationState() throws SQLException { Connection con = driver.connect(url, new Properties()); PhoenixConnection phxCon = new PhoenixConnection(con.unwrap(PhoenixConnection.class)); -final Map > mutations = Maps.newTreeMap(new TableRefComparator()); +final Map mutations = Maps.newTreeMap(new TableRefComparator()); // passing a null mutation state forces the connection.newMutationState() to be used to create the MutationState return new PhoenixConnection(phxCon, null) { @Override http://git-wip-us.apache.org/repos/asf/phoenix/blob/eb0f744d/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java index f9ca300..a06e2ca 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.hadoop.hbase.Cell; @@ -43,6 +42,7 @@ import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; import org.apache.phoenix.execute.AggregatePlan; import org.apache.phoenix.execute.MutationState; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.execute.MutationState.RowMutationState; import org.apache.phoenix.filter.SkipScanFilter; import org.apache.phoenix.hbase.index.ValueGetter; @@ -91,7 +91,6 @@ import org.apache.phoenix.util.ScanUtil; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.sun.istack.NotNull; public class DeleteCompiler { @@ -121,14 +120,14 @@ public class DeleteCompiler { final int maxSize =
[16/16] phoenix git commit: PHOENIX-4386 Calculate the estimatedSize of MutationState using Map<TableRef, Map<ImmutableBytesPtr, RowMutationState>> mutations (addendum)
PHOENIX-4386 Calculate the estimatedSize of MutationState using Map> mutations (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5b493962 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5b493962 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5b493962 Branch: refs/heads/4.x-HBase-1.2 Commit: 5b493962a437a264bb45f9698223a59f43623373 Parents: 4968e88 Author: Thomas D'Silva Authored: Tue Nov 21 03:13:53 2017 + Committer: James Taylor Committed: Sat Dec 16 16:42:54 2017 -0800 -- .../apache/phoenix/execute/PartialCommitIT.java | 5 +- .../apache/phoenix/compile/DeleteCompiler.java | 11 +- .../apache/phoenix/compile/UpsertCompiler.java | 7 +- .../apache/phoenix/execute/MutationState.java | 127 --- .../java/org/apache/phoenix/util/IndexUtil.java | 4 +- .../org/apache/phoenix/util/KeyValueUtil.java | 5 +- 6 files changed, 98 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b493962/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java index 10fd7f8..e5b57e3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java @@ -33,7 +33,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -52,8 +51,8 @@ import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseOwnClusterIT; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.hbase.index.Indexer; -import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.monitoring.GlobalMetric; import org.apache.phoenix.monitoring.MetricType; @@ -285,7 +284,7 @@ public class PartialCommitIT extends BaseOwnClusterIT { private PhoenixConnection getConnectionWithTableOrderPreservingMutationState() throws SQLException { Connection con = driver.connect(url, new Properties()); PhoenixConnection phxCon = new PhoenixConnection(con.unwrap(PhoenixConnection.class)); -final Map > mutations = Maps.newTreeMap(new TableRefComparator()); +final Map mutations = Maps.newTreeMap(new TableRefComparator()); // passing a null mutation state forces the connection.newMutationState() to be used to create the MutationState return new PhoenixConnection(phxCon, null) { @Override http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b493962/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java index f9ca300..a06e2ca 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.hadoop.hbase.Cell; @@ -43,6 +42,7 @@ import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; import org.apache.phoenix.execute.AggregatePlan; import org.apache.phoenix.execute.MutationState; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.execute.MutationState.RowMutationState; import org.apache.phoenix.filter.SkipScanFilter; import org.apache.phoenix.hbase.index.ValueGetter; @@ -91,7 +91,6 @@ import org.apache.phoenix.util.ScanUtil; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.sun.istack.NotNull; public class DeleteCompiler { @@ -121,14 +120,14 @@ public class DeleteCompiler { final int maxSize =
phoenix git commit: PHOENIX-4386 Calculate the estimatedSize of MutationState using Map<TableRef, Map<ImmutableBytesPtr, RowMutationState>> mutations (addendum)
Repository: phoenix Updated Branches: refs/heads/master 071fbce49 -> 25359a95f PHOENIX-4386 Calculate the estimatedSize of MutationState using Map> mutations (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/25359a95 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/25359a95 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/25359a95 Branch: refs/heads/master Commit: 25359a95f1a8c5aa6e852e750fd6da6e10249387 Parents: 071fbce Author: Thomas D'Silva Authored: Mon Nov 20 19:13:53 2017 -0800 Committer: Thomas D'Silva Committed: Wed Dec 6 12:26:15 2017 -0800 -- .../apache/phoenix/execute/PartialCommitIT.java | 5 +- .../apache/phoenix/compile/DeleteCompiler.java | 11 +- .../apache/phoenix/compile/UpsertCompiler.java | 7 +- .../apache/phoenix/execute/MutationState.java | 127 --- .../java/org/apache/phoenix/util/IndexUtil.java | 4 +- .../org/apache/phoenix/util/KeyValueUtil.java | 5 +- 6 files changed, 98 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/25359a95/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java index 10fd7f8..e5b57e3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java @@ -33,7 +33,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -52,8 +51,8 @@ import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseOwnClusterIT; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.hbase.index.Indexer; -import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.monitoring.GlobalMetric; import org.apache.phoenix.monitoring.MetricType; @@ -285,7 +284,7 @@ public class PartialCommitIT extends BaseOwnClusterIT { private PhoenixConnection getConnectionWithTableOrderPreservingMutationState() throws SQLException { Connection con = driver.connect(url, new Properties()); PhoenixConnection phxCon = new PhoenixConnection(con.unwrap(PhoenixConnection.class)); -final Map > mutations = Maps.newTreeMap(new TableRefComparator()); +final Map mutations = Maps.newTreeMap(new TableRefComparator()); // passing a null mutation state forces the connection.newMutationState() to be used to create the MutationState return new PhoenixConnection(phxCon, null) { @Override http://git-wip-us.apache.org/repos/asf/phoenix/blob/25359a95/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java index f9ca300..a06e2ca 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.hadoop.hbase.Cell; @@ -43,6 +42,7 @@ import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; import org.apache.phoenix.execute.AggregatePlan; import org.apache.phoenix.execute.MutationState; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.execute.MutationState.RowMutationState; import org.apache.phoenix.filter.SkipScanFilter; import org.apache.phoenix.hbase.index.ValueGetter; @@ -91,7 +91,6 @@ import org.apache.phoenix.util.ScanUtil; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.sun.istack.NotNull; public class DeleteCompiler { @@ -121,14
phoenix git commit: PHOENIX-4386 Calculate the estimatedSize of MutationState using Map<TableRef, Map<ImmutableBytesPtr, RowMutationState>> mutations (addendum)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 983ce023f -> 1df7aa5bb PHOENIX-4386 Calculate the estimatedSize of MutationState using Map> mutations (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1df7aa5b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1df7aa5b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1df7aa5b Branch: refs/heads/4.x-HBase-0.98 Commit: 1df7aa5bb602ee210241e478fc30c75ab4550e88 Parents: 983ce02 Author: Thomas D'Silva Authored: Mon Nov 20 19:13:53 2017 -0800 Committer: Thomas D'Silva Committed: Wed Dec 6 11:29:47 2017 -0800 -- .../apache/phoenix/execute/PartialCommitIT.java | 5 +- .../apache/phoenix/compile/DeleteCompiler.java | 11 +- .../apache/phoenix/compile/UpsertCompiler.java | 7 +- .../apache/phoenix/execute/MutationState.java | 127 --- .../java/org/apache/phoenix/util/IndexUtil.java | 4 +- .../org/apache/phoenix/util/KeyValueUtil.java | 5 +- 6 files changed, 98 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/1df7aa5b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java index 84edc84..c432aae 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java @@ -33,7 +33,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -52,8 +51,8 @@ import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseOwnClusterIT; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.hbase.index.Indexer; -import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.monitoring.GlobalMetric; import org.apache.phoenix.monitoring.MetricType; @@ -285,7 +284,7 @@ public class PartialCommitIT extends BaseOwnClusterIT { private PhoenixConnection getConnectionWithTableOrderPreservingMutationState() throws SQLException { Connection con = driver.connect(url, new Properties()); PhoenixConnection phxCon = new PhoenixConnection(con.unwrap(PhoenixConnection.class)); -final Map > mutations = Maps.newTreeMap(new TableRefComparator()); +final Map mutations = Maps.newTreeMap(new TableRefComparator()); // passing a null mutation state forces the connection.newMutationState() to be used to create the MutationState return new PhoenixConnection(phxCon, null) { @Override http://git-wip-us.apache.org/repos/asf/phoenix/blob/1df7aa5b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java index f9ca300..a06e2ca 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.hadoop.hbase.Cell; @@ -43,6 +42,7 @@ import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; import org.apache.phoenix.execute.AggregatePlan; import org.apache.phoenix.execute.MutationState; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.execute.MutationState.RowMutationState; import org.apache.phoenix.filter.SkipScanFilter; import org.apache.phoenix.hbase.index.ValueGetter; @@ -91,7 +91,6 @@ import org.apache.phoenix.util.ScanUtil; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.sun.istack.NotNull; public class DeleteCompiler {
[1/2] phoenix git commit: PHOENIX-4386 Calculate the estimatedSize of MutationState using Map<TableRef, Map<ImmutableBytesPtr, RowMutationState>> mutations (addendum)
Repository: phoenix Updated Branches: refs/heads/master c216b667a -> d46d4e564 PHOENIX-4386 Calculate the estimatedSize of MutationState using Map> mutations (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4e0c0a33 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4e0c0a33 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4e0c0a33 Branch: refs/heads/master Commit: 4e0c0a33ed8b401f7785dde8979041dd5ab9a1f4 Parents: c216b66 Author: Thomas D'Silva Authored: Mon Nov 20 19:13:53 2017 -0800 Committer: Thomas D'Silva Committed: Tue Nov 21 12:26:13 2017 -0800 -- .../apache/phoenix/execute/PartialCommitIT.java | 5 +- .../apache/phoenix/compile/DeleteCompiler.java | 11 +- .../apache/phoenix/compile/UpsertCompiler.java | 7 +- .../apache/phoenix/execute/MutationState.java | 127 --- .../java/org/apache/phoenix/util/IndexUtil.java | 4 +- .../org/apache/phoenix/util/KeyValueUtil.java | 5 +- 6 files changed, 98 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e0c0a33/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java index 10fd7f8..e5b57e3 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java @@ -33,7 +33,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -52,8 +51,8 @@ import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.BaseOwnClusterIT; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.hbase.index.Indexer; -import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.monitoring.GlobalMetric; import org.apache.phoenix.monitoring.MetricType; @@ -285,7 +284,7 @@ public class PartialCommitIT extends BaseOwnClusterIT { private PhoenixConnection getConnectionWithTableOrderPreservingMutationState() throws SQLException { Connection con = driver.connect(url, new Properties()); PhoenixConnection phxCon = new PhoenixConnection(con.unwrap(PhoenixConnection.class)); -final Map > mutations = Maps.newTreeMap(new TableRefComparator()); +final Map mutations = Maps.newTreeMap(new TableRefComparator()); // passing a null mutation state forces the connection.newMutationState() to be used to create the MutationState return new PhoenixConnection(phxCon, null) { @Override http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e0c0a33/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java index f9ca300..a06e2ca 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.hadoop.hbase.Cell; @@ -43,6 +42,7 @@ import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; import org.apache.phoenix.execute.AggregatePlan; import org.apache.phoenix.execute.MutationState; +import org.apache.phoenix.execute.MutationState.MultiRowMutationState; import org.apache.phoenix.execute.MutationState.RowMutationState; import org.apache.phoenix.filter.SkipScanFilter; import org.apache.phoenix.hbase.index.ValueGetter; @@ -91,7 +91,6 @@ import org.apache.phoenix.util.ScanUtil; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.sun.istack.NotNull; public class DeleteCompiler { @@ -121,14