You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by je...@apache.org on 2014/03/10 05:22:05 UTC

[34/36] git commit: merge master into 4.0 branch

merge master into 4.0 branch


Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/329be994
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/329be994
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/329be994

Branch: refs/heads/4.0
Commit: 329be9940b93c57e5d5a783b025f77a2fae913f6
Parents: 52a57b5 240f89e
Author: Jeffrey Zhong <jz...@JZhongs-MacBook-Pro.local>
Authored: Sun Mar 9 19:17:40 2014 -0700
Committer: Jeffrey Zhong <jz...@JZhongs-MacBook-Pro.local>
Committed: Sun Mar 9 19:17:40 2014 -0700

----------------------------------------------------------------------
 phoenix-assembly/src/build/all.xml              |  14 -
 .../src/build/components-minimal.xml            |   1 -
 phoenix-core/src/main/antlr3/PhoenixSQL.g       |   4 +-
 .../apache/phoenix/compile/DeleteCompiler.java  |   4 +-
 .../phoenix/compile/ExpressionCompiler.java     |   3 +-
 .../phoenix/compile/ExpressionProjector.java    |   3 +-
 .../apache/phoenix/compile/GroupByCompiler.java |  27 +-
 .../apache/phoenix/compile/PostDDLCompiler.java |  12 +-
 .../phoenix/compile/ProjectionCompiler.java     |   6 +-
 .../apache/phoenix/compile/UpsertCompiler.java  |   7 +-
 .../coprocessor/BaseScannerRegionObserver.java  |  20 +-
 .../GroupedAggregateRegionObserver.java         |  14 +-
 .../phoenix/coprocessor/ScanRegionObserver.java |  10 +-
 .../UngroupedAggregateRegionObserver.java       |  20 +-
 .../ValueTypeIncompatibleException.java         |   2 +-
 .../org/apache/phoenix/execute/ScanPlan.java    |   3 +-
 .../expression/ArrayConstructorExpression.java  |  11 +-
 .../expression/BaseCompoundExpression.java      |  11 +-
 .../phoenix/expression/BaseExpression.java      |   6 +
 .../expression/BaseSingleExpression.java        |   5 +
 .../phoenix/expression/CaseExpression.java      |   4 +
 .../apache/phoenix/expression/Expression.java   |  17 +-
 .../phoenix/expression/IsNullExpression.java    |   5 +
 .../phoenix/expression/LiteralExpression.java   |   3 +
 .../expression/RowKeyColumnExpression.java      |  12 +
 .../RowValueConstructorExpression.java          |   5 +
 .../expression/function/ArrayIndexFunction.java |   3 +-
 .../function/ArrayLengthFunction.java           |   6 +-
 .../expression/function/CoalesceFunction.java   |   5 +
 .../phoenix/filter/BooleanExpressionFilter.java |   9 -
 .../filter/EvaluateOnCompletionVisitor.java     |  89 ------
 .../filter/MultiKeyValueComparisonFilter.java   |   6 +-
 .../filter/SingleKeyValueComparisonFilter.java  |   7 +-
 .../java/org/apache/phoenix/job/JobManager.java |  11 +-
 .../query/ConnectionQueryServicesImpl.java      |  43 ++-
 .../apache/phoenix/query/QueryConstants.java    |   9 +-
 .../apache/phoenix/schema/PArrayDataType.java   | 170 ++++------
 .../org/apache/phoenix/schema/PDataType.java    | 315 ++++++++++++-------
 .../org/apache/phoenix/schema/PhoenixArray.java |  72 ++++-
 .../java/org/apache/phoenix/util/IndexUtil.java |   9 +-
 .../phoenix/compile/QueryCompilerTest.java      |  12 +-
 .../ConnectionQueryServicesTestImpl.java        |  20 +-
 .../org/apache/phoenix/end2end/QueryTest.java   |  41 ++-
 .../phoenix/index/IndexMaintainerTest.java      |  42 ++-
 .../phoenix/schema/PDataTypeForArraysTest.java  |   6 +-
 pom.xml                                         |   7 +-
 46 files changed, 642 insertions(+), 469 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/phoenix-assembly/src/build/all.xml
----------------------------------------------------------------------
diff --cc phoenix-assembly/src/build/all.xml
index e0c9ac3,9c1bc41..2365a0b
--- a/phoenix-assembly/src/build/all.xml
+++ b/phoenix-assembly/src/build/all.xml
@@@ -30,21 -30,54 +30,8 @@@
    </formats>
    <includeBaseDirectory>true</includeBaseDirectory>
    
--  <moduleSets>
--    <moduleSet>
--      <!-- Enable access to all projects in the current multimodule build. Eclipse 
--        says this is an error, but builds from the command line just fine. -->
--      <useAllReactorProjects>true</useAllReactorProjects>
-       <!-- Binaries for the dependencies also go in the lib directory -->
-       <binaries>
-         <outputDirectory>lib</outputDirectory>
-         <unpack>false</unpack>
-       </binaries>
-     </moduleSet>
-   </moduleSets>
- 
 -       <!-- Include all the sources in the top directory -->
 -      <sources>
 -         <fileSets>
 -          <fileSet>
 -            <!-- Make sure this excludes is same as the phoenix-hadoop2-compat
 -                 excludes below -->
 -            <excludes>
 -              <exclude>target/</exclude>
 -              <exclude>test/</exclude>
 -              <exclude>.classpath</exclude>
 -              <exclude>.project</exclude>
 -              <exclude>.settings/</exclude>
 -            </excludes>
 -          </fileSet>
 -        </fileSets>
 -      </sources>
 -      <!-- Binaries for the dependencies also go in the lib directory -->
 -      <binaries>
 -        <outputDirectory>lib</outputDirectory>
 -        <unpack>false</unpack>
 -      </binaries>
 -    </moduleSet>
 -  </moduleSets>
 -
    <fileSets>
 -    <!--This one is weird.  When we assemble src, it'll be default profile which
 -         at the moment is hadoop1.  But we should include the hadoop2 compat module
 -         too so can build hadoop2 from src -->
 -    <fileSet>
 -      <directory>${project.basedir}/..</directory>
 -      <fileMode>0644</fileMode>
 -      <directoryMode>0755</directoryMode>
 -      <includes>
 -        <include>phoenix-*</include>
 -        </includes>
 -            <excludes>
 -              <exclude>target/</exclude>
 -              <exclude>test/</exclude>
 -              <exclude>.classpath</exclude>
 -              <exclude>.project</exclude>
 -              <exclude>.settings/</exclude>
 -            </excludes>
 -    </fileSet>
 +    <!-- Top level directories -->
      <fileSet>
        <!--Get misc project files -->
        <directory>${project.basedir}/..</directory>
@@@ -174,11 -141,7 +161,10 @@@
          <include>org.apache.zookeeper:zookeeper</include>
          <include>log4j:log4j</include>
          <include>org.apache.hbase:hbase*</include>
-         <include>net.sf.opencsv:opencsv</include>
          <include>org.antlr:antlr</include>
 +        <include>org.cloudera.htrace:htrace-core</include>
 +        <include>io.netty:netty</include>
 +        <include>commons-codec:commons-codec</include>
        </includes>
      </dependencySet>
      <!-- Separate dependency set to just pull in the jackson stuff since its test 

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/ScanRegionObserver.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index dd28d61,4dc0e5e..a118520
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@@ -89,16 -89,7 +89,16 @@@ import com.google.common.collect.Sets
   * @since 0.1
   */
  public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver {
- 	private static final Logger logger = LoggerFactory.getLogger(UngroupedAggregateRegionObserver.class);
 +
 +    // TODO: move all constants into a single class
 +    public static final String UNGROUPED_AGG = "UngroupedAgg";
 +    public static final String DELETE_AGG = "DeleteAgg";
 +    public static final String UPSERT_SELECT_TABLE = "UpsertSelectTable";
 +    public static final String UPSERT_SELECT_EXPRS = "UpsertSelectExprs";
 +    public static final String DELETE_CQ = "DeleteCQ";
 +    public static final String DELETE_CF = "DeleteCF";
 +    public static final String EMPTY_CF = "EmptyCF";
+     private static final Logger logger = LoggerFactory.getLogger(UngroupedAggregateRegionObserver.class);
      private KeyValueBuilder kvBuilder;
      
      @Override

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/phoenix-core/src/main/java/org/apache/phoenix/filter/BooleanExpressionFilter.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/filter/BooleanExpressionFilter.java
index d0a19ad,44fe76e..e0caf9f
--- a/phoenix-core/src/main/java/org/apache/phoenix/filter/BooleanExpressionFilter.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/filter/BooleanExpressionFilter.java
@@@ -40,10 -38,9 +40,9 @@@ import org.apache.phoenix.util.ServerUt
   * 
   * @since 0.1
   */
 -abstract public class BooleanExpressionFilter extends FilterBase {
 +abstract public class BooleanExpressionFilter extends FilterBase implements Writable {
  
      protected Expression expression;
-     protected boolean evaluateOnCompletion;
      private ImmutableBytesWritable tempPtr = new ImmutableBytesWritable();
      
      public BooleanExpressionFilter() {

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/phoenix-core/src/main/java/org/apache/phoenix/filter/MultiKeyValueComparisonFilter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/phoenix-core/src/main/java/org/apache/phoenix/filter/SingleKeyValueComparisonFilter.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/filter/SingleKeyValueComparisonFilter.java
index 4bc40a7,077a8d9..a136e8c
--- a/phoenix-core/src/main/java/org/apache/phoenix/filter/SingleKeyValueComparisonFilter.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/filter/SingleKeyValueComparisonFilter.java
@@@ -20,14 -20,11 +20,14 @@@ package org.apache.phoenix.filter
  import java.io.DataInput;
  import java.io.IOException;
  
 +import org.apache.hadoop.hbase.Cell;
 +import org.apache.hadoop.hbase.CellUtil;
  import org.apache.hadoop.hbase.KeyValue;
 +import org.apache.hadoop.hbase.KeyValueUtil;
  import org.apache.hadoop.hbase.util.Bytes;
- 
  import org.apache.phoenix.expression.Expression;
  import org.apache.phoenix.expression.KeyValueColumnExpression;
+ import org.apache.phoenix.expression.visitor.TraverseAllExpressionVisitor;
  import org.apache.phoenix.schema.tuple.SingleKeyValueTuple;
  
  

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/phoenix-core/src/main/java/org/apache/phoenix/job/JobManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/phoenix-core/src/test/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/phoenix-core/src/test/java/org/apache/phoenix/index/IndexMaintainerTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/329be994/pom.xml
----------------------------------------------------------------------