[2/2] phoenix git commit: PHOENIX-4996: Refactor PTableImpl to use Builder Pattern
PHOENIX-4996: Refactor PTableImpl to use Builder Pattern
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/11cc13b0
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/11cc13b0
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/11cc13b0
Branch: refs/heads/master
Commit: 11cc13b043c9d73c49134f27aef5e4c05dc6f30a
Parents: 6053ee6
Author: Chinmay Kulkarni
Authored: Wed Oct 24 17:56:22 2018 -0700
Committer: Thomas D'Silva
Committed: Tue Nov 6 15:18:45 2018 -0800
--
.../apache/phoenix/compile/DeleteCompiler.java |6 +-
.../apache/phoenix/compile/FromCompiler.java| 66 +-
.../apache/phoenix/compile/JoinCompiler.java| 52 +-
.../compile/TupleProjectionCompiler.java| 60 +-
.../apache/phoenix/compile/UnionCompiler.java | 41 +-
.../apache/phoenix/compile/UpsertCompiler.java | 12 +-
.../coprocessor/MetaDataEndpointImpl.java | 96 +-
.../UngroupedAggregateRegionObserver.java |6 +-
.../coprocessor/WhereConstantParser.java|3 +-
.../query/ConnectionlessQueryServicesImpl.java |9 +-
.../apache/phoenix/schema/MetaDataClient.java | 215 ++-
.../apache/phoenix/schema/PMetaDataImpl.java| 28 +-
.../org/apache/phoenix/schema/PTableImpl.java | 1259 +++---
.../org/apache/phoenix/schema/TableRef.java | 17 +-
.../phoenix/execute/CorrelatePlanTest.java | 32 +-
.../execute/LiteralResultIteratorPlanTest.java | 33 +-
16 files changed, 1302 insertions(+), 633 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/11cc13b0/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 14ec45d..51366c0 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
@@ -27,7 +27,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.apache.hadoop.hbase.Cell;
@@ -90,7 +89,6 @@ import org.apache.phoenix.schema.types.PLong;
import org.apache.phoenix.transaction.PhoenixTransactionProvider.Feature;
import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.IndexUtil;
-import org.apache.phoenix.util.MetaDataUtil;
import org.apache.phoenix.util.ScanUtil;
import com.google.common.base.Preconditions;
@@ -616,7 +614,9 @@ public class DeleteCompiler {
}
});
}
-PTable projectedTable = PTableImpl.makePTable(table,
PTableType.PROJECTED, adjustedProjectedColumns);
+PTable projectedTable = PTableImpl.builderWithColumns(table,
adjustedProjectedColumns)
+.setType(PTableType.PROJECTED)
+.build();
final TableRef projectedTableRef = new TableRef(projectedTable,
targetTableRef.getLowerBoundTimeStamp(), targetTableRef.getTimeStamp());
QueryPlan bestPlanToBe = dataPlan;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/11cc13b0/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
index 80648a3..d0a49cc 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
@@ -32,8 +32,6 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.MetaDataProtocol;
import org.apache.phoenix.coprocessor.MetaDataProtocol.MetaDataMutationResult;
import org.apache.phoenix.coprocessor.MetaDataProtocol.MutationCode;
-import org.apache.phoenix.exception.SQLExceptionCode;
-import org.apache.phoenix.exception.SQLExceptionInfo;
import org.apache.phoenix.expression.Expression;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.parse.AliasedNode;
@@ -82,6 +80,7 @@ import org.apache.phoenix.schema.PTableImpl;
import org.apache.phoenix.schema.PTableKey;
import org.apache.phoenix.schema.PTableType;
import org.apache.phoenix.schema.ProjectedColumn;
+import org.apache.phoenix.schema.RowKeySchema;
import org.apache.phoenix.schema.SchemaNotFoundException;
import org.apache.phoenix.schema.SortOrder;
import org.apache.phoenix.schema.TableNotFoundException;
@@ -284,7 +283,8 @@ public class
[2/2] phoenix git commit: PHOENIX-4996: Refactor PTableImpl to use Builder Pattern
PHOENIX-4996: Refactor PTableImpl to use Builder Pattern
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ee8db198
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ee8db198
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ee8db198
Branch: refs/heads/4.x-HBase-1.4
Commit: ee8db198a3586a83593e4610b2ea8349f9371c1f
Parents: 51d38d7
Author: Chinmay Kulkarni
Authored: Fri Nov 2 14:00:09 2018 -0700
Committer: Thomas D'Silva
Committed: Tue Nov 6 15:19:16 2018 -0800
--
.../apache/phoenix/compile/DeleteCompiler.java |5 +-
.../apache/phoenix/compile/FromCompiler.java| 66 +-
.../apache/phoenix/compile/JoinCompiler.java| 53 +-
.../compile/TupleProjectionCompiler.java| 60 +-
.../apache/phoenix/compile/UnionCompiler.java | 41 +-
.../apache/phoenix/compile/UpsertCompiler.java | 12 +-
.../coprocessor/MetaDataEndpointImpl.java | 96 +-
.../UngroupedAggregateRegionObserver.java |6 +-
.../coprocessor/WhereConstantParser.java|3 +-
.../query/ConnectionlessQueryServicesImpl.java |9 +-
.../apache/phoenix/schema/MetaDataClient.java | 215 ++-
.../apache/phoenix/schema/PMetaDataImpl.java| 28 +-
.../org/apache/phoenix/schema/PTableImpl.java | 1259 +++---
.../org/apache/phoenix/schema/TableRef.java | 17 +-
.../phoenix/execute/CorrelatePlanTest.java | 32 +-
.../execute/LiteralResultIteratorPlanTest.java | 33 +-
16 files changed, 1303 insertions(+), 632 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ee8db198/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 583085e..8c9a930 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
@@ -89,7 +89,6 @@ import org.apache.phoenix.schema.types.PLong;
import org.apache.phoenix.transaction.PhoenixTransactionProvider.Feature;
import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.IndexUtil;
-import org.apache.phoenix.util.MetaDataUtil;
import org.apache.phoenix.util.ScanUtil;
import com.google.common.base.Preconditions;
@@ -615,7 +614,9 @@ public class DeleteCompiler {
}
});
}
-PTable projectedTable = PTableImpl.makePTable(table,
PTableType.PROJECTED, adjustedProjectedColumns);
+PTable projectedTable = PTableImpl.builderWithColumns(table,
adjustedProjectedColumns)
+.setType(PTableType.PROJECTED)
+.build();
final TableRef projectedTableRef = new TableRef(projectedTable,
targetTableRef.getLowerBoundTimeStamp(), targetTableRef.getTimeStamp());
QueryPlan bestPlanToBe = dataPlan;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ee8db198/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
index efc66a9..2701af0 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
@@ -32,8 +32,6 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.MetaDataProtocol;
import org.apache.phoenix.coprocessor.MetaDataProtocol.MetaDataMutationResult;
import org.apache.phoenix.coprocessor.MetaDataProtocol.MutationCode;
-import org.apache.phoenix.exception.SQLExceptionCode;
-import org.apache.phoenix.exception.SQLExceptionInfo;
import org.apache.phoenix.expression.Expression;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.parse.AliasedNode;
@@ -82,6 +80,7 @@ import org.apache.phoenix.schema.PTableImpl;
import org.apache.phoenix.schema.PTableKey;
import org.apache.phoenix.schema.PTableType;
import org.apache.phoenix.schema.ProjectedColumn;
+import org.apache.phoenix.schema.RowKeySchema;
import org.apache.phoenix.schema.SchemaNotFoundException;
import org.apache.phoenix.schema.SortOrder;
import org.apache.phoenix.schema.TableNotFoundException;
@@ -284,7 +283,8 @@ public class FromCompiler {
column.getTimestamp());
projectedColumns.add(projectedColumn);
}
-PTable t = PTableImpl.makePTable(table, projectedColumns);
+PTable t =
[2/2] phoenix git commit: PHOENIX-4996: Refactor PTableImpl to use Builder Pattern
PHOENIX-4996: Refactor PTableImpl to use Builder Pattern
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d6083ae5
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d6083ae5
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d6083ae5
Branch: refs/heads/4.x-HBase-1.3
Commit: d6083ae5c598f5293adbfb24370b8e40962bc3d7
Parents: 9bfaf18
Author: Chinmay Kulkarni
Authored: Fri Nov 2 14:00:09 2018 -0700
Committer: Thomas D'Silva
Committed: Tue Nov 6 15:19:09 2018 -0800
--
.../apache/phoenix/compile/DeleteCompiler.java |5 +-
.../apache/phoenix/compile/FromCompiler.java| 66 +-
.../apache/phoenix/compile/JoinCompiler.java| 53 +-
.../compile/TupleProjectionCompiler.java| 60 +-
.../apache/phoenix/compile/UnionCompiler.java | 41 +-
.../apache/phoenix/compile/UpsertCompiler.java | 12 +-
.../coprocessor/MetaDataEndpointImpl.java | 96 +-
.../UngroupedAggregateRegionObserver.java |6 +-
.../coprocessor/WhereConstantParser.java|3 +-
.../query/ConnectionlessQueryServicesImpl.java |9 +-
.../apache/phoenix/schema/MetaDataClient.java | 215 ++-
.../apache/phoenix/schema/PMetaDataImpl.java| 28 +-
.../org/apache/phoenix/schema/PTableImpl.java | 1259 +++---
.../org/apache/phoenix/schema/TableRef.java | 17 +-
.../phoenix/execute/CorrelatePlanTest.java | 32 +-
.../execute/LiteralResultIteratorPlanTest.java | 33 +-
16 files changed, 1303 insertions(+), 632 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6083ae5/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 583085e..8c9a930 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
@@ -89,7 +89,6 @@ import org.apache.phoenix.schema.types.PLong;
import org.apache.phoenix.transaction.PhoenixTransactionProvider.Feature;
import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.IndexUtil;
-import org.apache.phoenix.util.MetaDataUtil;
import org.apache.phoenix.util.ScanUtil;
import com.google.common.base.Preconditions;
@@ -615,7 +614,9 @@ public class DeleteCompiler {
}
});
}
-PTable projectedTable = PTableImpl.makePTable(table,
PTableType.PROJECTED, adjustedProjectedColumns);
+PTable projectedTable = PTableImpl.builderWithColumns(table,
adjustedProjectedColumns)
+.setType(PTableType.PROJECTED)
+.build();
final TableRef projectedTableRef = new TableRef(projectedTable,
targetTableRef.getLowerBoundTimeStamp(), targetTableRef.getTimeStamp());
QueryPlan bestPlanToBe = dataPlan;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6083ae5/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
index efc66a9..2701af0 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
@@ -32,8 +32,6 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.MetaDataProtocol;
import org.apache.phoenix.coprocessor.MetaDataProtocol.MetaDataMutationResult;
import org.apache.phoenix.coprocessor.MetaDataProtocol.MutationCode;
-import org.apache.phoenix.exception.SQLExceptionCode;
-import org.apache.phoenix.exception.SQLExceptionInfo;
import org.apache.phoenix.expression.Expression;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.parse.AliasedNode;
@@ -82,6 +80,7 @@ import org.apache.phoenix.schema.PTableImpl;
import org.apache.phoenix.schema.PTableKey;
import org.apache.phoenix.schema.PTableType;
import org.apache.phoenix.schema.ProjectedColumn;
+import org.apache.phoenix.schema.RowKeySchema;
import org.apache.phoenix.schema.SchemaNotFoundException;
import org.apache.phoenix.schema.SortOrder;
import org.apache.phoenix.schema.TableNotFoundException;
@@ -284,7 +283,8 @@ public class FromCompiler {
column.getTimestamp());
projectedColumns.add(projectedColumn);
}
-PTable t = PTableImpl.makePTable(table, projectedColumns);
+PTable t =
[2/2] phoenix git commit: PHOENIX-4996: Refactor PTableImpl to use Builder Pattern
PHOENIX-4996: Refactor PTableImpl to use Builder Pattern
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/02a6bbce
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/02a6bbce
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/02a6bbce
Branch: refs/heads/4.x-HBase-1.2
Commit: 02a6bbce5a210278639e9d223ceb9a16cc645189
Parents: c509d58
Author: Chinmay Kulkarni
Authored: Fri Nov 2 14:00:09 2018 -0700
Committer: Thomas D'Silva
Committed: Tue Nov 6 15:19:05 2018 -0800
--
.../apache/phoenix/compile/DeleteCompiler.java |5 +-
.../apache/phoenix/compile/FromCompiler.java| 66 +-
.../apache/phoenix/compile/JoinCompiler.java| 53 +-
.../compile/TupleProjectionCompiler.java| 60 +-
.../apache/phoenix/compile/UnionCompiler.java | 41 +-
.../apache/phoenix/compile/UpsertCompiler.java | 12 +-
.../coprocessor/MetaDataEndpointImpl.java | 96 +-
.../UngroupedAggregateRegionObserver.java |6 +-
.../coprocessor/WhereConstantParser.java|3 +-
.../query/ConnectionlessQueryServicesImpl.java |9 +-
.../apache/phoenix/schema/MetaDataClient.java | 215 ++-
.../apache/phoenix/schema/PMetaDataImpl.java| 28 +-
.../org/apache/phoenix/schema/PTableImpl.java | 1259 +++---
.../org/apache/phoenix/schema/TableRef.java | 17 +-
.../phoenix/execute/CorrelatePlanTest.java | 32 +-
.../execute/LiteralResultIteratorPlanTest.java | 33 +-
16 files changed, 1303 insertions(+), 632 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/02a6bbce/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 583085e..8c9a930 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
@@ -89,7 +89,6 @@ import org.apache.phoenix.schema.types.PLong;
import org.apache.phoenix.transaction.PhoenixTransactionProvider.Feature;
import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.IndexUtil;
-import org.apache.phoenix.util.MetaDataUtil;
import org.apache.phoenix.util.ScanUtil;
import com.google.common.base.Preconditions;
@@ -615,7 +614,9 @@ public class DeleteCompiler {
}
});
}
-PTable projectedTable = PTableImpl.makePTable(table,
PTableType.PROJECTED, adjustedProjectedColumns);
+PTable projectedTable = PTableImpl.builderWithColumns(table,
adjustedProjectedColumns)
+.setType(PTableType.PROJECTED)
+.build();
final TableRef projectedTableRef = new TableRef(projectedTable,
targetTableRef.getLowerBoundTimeStamp(), targetTableRef.getTimeStamp());
QueryPlan bestPlanToBe = dataPlan;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/02a6bbce/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
index efc66a9..2701af0 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/FromCompiler.java
@@ -32,8 +32,6 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.MetaDataProtocol;
import org.apache.phoenix.coprocessor.MetaDataProtocol.MetaDataMutationResult;
import org.apache.phoenix.coprocessor.MetaDataProtocol.MutationCode;
-import org.apache.phoenix.exception.SQLExceptionCode;
-import org.apache.phoenix.exception.SQLExceptionInfo;
import org.apache.phoenix.expression.Expression;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.parse.AliasedNode;
@@ -82,6 +80,7 @@ import org.apache.phoenix.schema.PTableImpl;
import org.apache.phoenix.schema.PTableKey;
import org.apache.phoenix.schema.PTableType;
import org.apache.phoenix.schema.ProjectedColumn;
+import org.apache.phoenix.schema.RowKeySchema;
import org.apache.phoenix.schema.SchemaNotFoundException;
import org.apache.phoenix.schema.SortOrder;
import org.apache.phoenix.schema.TableNotFoundException;
@@ -284,7 +283,8 @@ public class FromCompiler {
column.getTimestamp());
projectedColumns.add(projectedColumn);
}
-PTable t = PTableImpl.makePTable(table, projectedColumns);
+PTable t =
