Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 8c50fc144 -> 7789616f9
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7789616f/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java index 3fa0c1e..87fb88e 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java @@ -317,7 +317,7 @@ public class ConnectionlessQueryServicesImpl extends DelegateQueryServices imple @Override public MutationState updateData(MutationPlan plan) throws SQLException { - return new MutationState(0, plan.getConnection()); + return new MutationState(0, plan.getContext().getConnection()); } @Override http://git-wip-us.apache.org/repos/asf/phoenix/blob/7789616f/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java index 753c122..21548b0 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java @@ -87,7 +87,6 @@ import static org.apache.phoenix.schema.PTableType.VIEW; import java.io.IOException; import java.sql.Connection; import java.sql.DriverManager; -import java.sql.ParameterMetaData; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; @@ -119,8 +118,8 @@ import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; +import org.apache.phoenix.compile.BaseMutationPlan; import org.apache.phoenix.compile.ColumnResolver; -import org.apache.phoenix.compile.ExplainPlan; import org.apache.phoenix.compile.FromCompiler; import org.apache.phoenix.compile.IndexExpressionCompiler; import org.apache.phoenix.compile.MutationPlan; @@ -143,8 +142,8 @@ import org.apache.phoenix.hbase.index.covered.update.ColumnReference; import org.apache.phoenix.index.IndexMaintainer; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; -import org.apache.phoenix.jdbc.PhoenixParameterMetaData; import org.apache.phoenix.jdbc.PhoenixStatement; +import org.apache.phoenix.jdbc.PhoenixStatement.Operation; import org.apache.phoenix.parse.AddColumnStatement; import org.apache.phoenix.parse.AlterIndexStatement; import org.apache.phoenix.parse.ColumnDef; @@ -1007,27 +1006,7 @@ public class MetaDataClient { // Go through MutationPlan abstraction so that we can create local indexes // with a connectionless connection (which makes testing easier). - mutationPlan = new MutationPlan() { - - @Override - public StatementContext getContext() { - return plan.getContext(); - } - - @Override - public ParameterMetaData getParameterMetaData() { - return PhoenixParameterMetaData.EMPTY_PARAMETER_META_DATA; - } - - @Override - public ExplainPlan getExplainPlan() throws SQLException { - return ExplainPlan.EMPTY_PLAN; - } - - @Override - public PhoenixConnection getConnection() { - return connection; - } + mutationPlan = new BaseMutationPlan(plan.getContext(), Operation.UPSERT) { @Override public MutationState execute() throws SQLException { http://git-wip-us.apache.org/repos/asf/phoenix/blob/7789616f/phoenix-core/src/test/java/org/apache/phoenix/query/ParallelIteratorsSplitTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/ParallelIteratorsSplitTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/ParallelIteratorsSplitTest.java index 6febf60..51073dd 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/ParallelIteratorsSplitTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/ParallelIteratorsSplitTest.java @@ -29,6 +29,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Properties; +import java.util.Set; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.client.Scan; @@ -50,12 +51,11 @@ import org.apache.phoenix.iterate.SpoolingResultIterator; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.jdbc.PhoenixParameterMetaData; import org.apache.phoenix.jdbc.PhoenixStatement; +import org.apache.phoenix.jdbc.PhoenixStatement.Operation; import org.apache.phoenix.parse.FilterableStatement; import org.apache.phoenix.parse.PFunction; import org.apache.phoenix.parse.SelectStatement; -import org.apache.phoenix.schema.types.PChar; import org.apache.phoenix.schema.ColumnRef; -import org.apache.phoenix.schema.types.PDataType; import org.apache.phoenix.schema.PDatum; import org.apache.phoenix.schema.PTable; import org.apache.phoenix.schema.PTableKey; @@ -63,6 +63,8 @@ import org.apache.phoenix.schema.RowKeySchema; import org.apache.phoenix.schema.RowKeySchema.RowKeySchemaBuilder; import org.apache.phoenix.schema.SortOrder; import org.apache.phoenix.schema.TableRef; +import org.apache.phoenix.schema.types.PChar; +import org.apache.phoenix.schema.types.PDataType; import org.apache.phoenix.util.ByteUtil; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; @@ -71,6 +73,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import com.google.common.base.Function; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; @@ -351,7 +354,8 @@ public class ParallelIteratorsSplitTest extends BaseConnectionlessQueryTest { final StatementContext context = new StatementContext(statement, resolver, scan, new SequenceManager(statement)); context.setScanRanges(scanRanges); ParallelIterators parallelIterators = new ParallelIterators(new QueryPlan() { - + private final Set<TableRef> tableRefs = ImmutableSet.of(tableRef); + @Override public StatementContext getContext() { return context; @@ -383,6 +387,11 @@ public class ParallelIteratorsSplitTest extends BaseConnectionlessQueryTest { } @Override + public Set<TableRef> getSourceRefs() { + return tableRefs; + } + + @Override public TableRef getTableRef() { return tableRef; } @@ -433,6 +442,11 @@ public class ParallelIteratorsSplitTest extends BaseConnectionlessQueryTest { } @Override + public Operation getOperation() { + return Operation.QUERY; + } + + @Override public boolean useRoundRobinIterator() { return false; } @@ -441,4 +455,4 @@ public class ParallelIteratorsSplitTest extends BaseConnectionlessQueryTest { List<KeyRange> keyRanges = parallelIterators.getSplits(); return keyRanges; } -} +} \ No newline at end of file
