merge master
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d10a5265 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d10a5265 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d10a5265 Branch: refs/heads/txn Commit: d10a526591d63635703893012aad3035d8e07023 Parents: 99a1802 6a48b98 Author: Thomas D'Silva <[email protected]> Authored: Fri Nov 13 13:36:08 2015 -0800 Committer: Thomas D'Silva <[email protected]> Committed: Fri Nov 13 13:36:08 2015 -0800 ---------------------------------------------------------------------- .../apache/phoenix/end2end/AlterTableIT.java | 8 +- .../phoenix/end2end/AlterTableWithViewsIT.java | 8 +- .../org/apache/phoenix/end2end/HashJoinIT.java | 63 +++++++ .../end2end/index/IndexExpressionIT.java | 1 + .../apache/phoenix/cache/ServerCacheClient.java | 14 +- .../phoenix/compile/CreateFunctionCompiler.java | 3 - .../apache/phoenix/compile/UpsertCompiler.java | 9 - .../phoenix/execute/SortMergeJoinPlan.java | 1 - .../org/apache/phoenix/execute/UnionPlan.java | 1 - .../MaterializedComparableResultIterator.java | 72 +++++++ .../iterate/MergeSortResultIterator.java | 99 +++++----- .../apache/phoenix/schema/MetaDataClient.java | 10 +- .../schema/types/PUnsignedDoubleArray.java | 4 +- .../schema/types/PUnsignedFloatArray.java | 4 +- .../phoenix/schema/types/PUnsignedIntArray.java | 4 +- .../schema/types/PUnsignedLongArray.java | 4 +- .../schema/types/PUnsignedSmallintArray.java | 4 +- .../schema/types/PUnsignedTinyintArray.java | 4 +- .../org/apache/phoenix/util/ColumnInfo.java | 89 ++++++++- .../org/apache/phoenix/util/PhoenixRuntime.java | 18 +- .../java/org/apache/phoenix/util/ScanUtil.java | 7 + .../iterate/MergeSortResultIteratorTest.java | 159 +++++++++++++--- .../java/org/apache/phoenix/query/BaseTest.java | 188 +++++++++---------- .../schema/types/PDataTypeForArraysTest.java | 11 ++ .../org/apache/phoenix/util/ColumnInfoTest.java | 27 +++ .../java/org/apache/phoenix/util/TestUtil.java | 3 +- phoenix-spark/src/it/resources/setup.sql | 2 +- .../apache/phoenix/spark/PhoenixSparkIT.scala | 8 +- .../org/apache/phoenix/spark/PhoenixRDD.scala | 16 +- 29 files changed, 598 insertions(+), 243 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d10a5265/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d10a5265/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexExpressionIT.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d10a5265/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d10a5265/phoenix-core/src/main/java/org/apache/phoenix/compile/CreateFunctionCompiler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d10a5265/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d10a5265/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d10a5265/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d10a5265/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d10a5265/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java ---------------------------------------------------------------------- diff --cc phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java index 041ed9f,1f9b20c..9c86c6d --- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java @@@ -186,32 -166,28 +186,32 @@@ import com.google.inject.util.Providers */ public abstract class BaseTest { protected static final String TEST_TABLE_SCHEMA = "(" + - " varchar_pk VARCHAR NOT NULL, " + - " char_pk CHAR(6) NOT NULL, " + - " int_pk INTEGER NOT NULL, "+ - " long_pk BIGINT NOT NULL, " + - " decimal_pk DECIMAL(31, 10) NOT NULL, " + - " date_pk DATE NOT NULL, " + - " a.varchar_col1 VARCHAR, " + - " a.char_col1 CHAR(10), " + - " a.int_col1 INTEGER, " + - " a.long_col1 BIGINT, " + - " a.decimal_col1 DECIMAL(31, 10), " + - " a.date1 DATE, " + - " b.varchar_col2 VARCHAR, " + - " b.char_col2 CHAR(10), " + - " b.int_col2 INTEGER, " + - " b.long_col2 BIGINT, " + - " b.decimal_col2 DECIMAL(31, 10), " + - " b.date2 DATE " + - " CONSTRAINT pk PRIMARY KEY (varchar_pk, char_pk, int_pk, long_pk DESC, decimal_pk, date_pk)) "; - private static final Map<String,String> tableDDLMap; + " varchar_pk VARCHAR NOT NULL, " + + " char_pk CHAR(6) NOT NULL, " + + " int_pk INTEGER NOT NULL, "+ + " long_pk BIGINT NOT NULL, " + + " decimal_pk DECIMAL(31, 10) NOT NULL, " + + " date_pk DATE NOT NULL, " + + " a.varchar_col1 VARCHAR, " + + " a.char_col1 CHAR(10), " + + " a.int_col1 INTEGER, " + + " a.long_col1 BIGINT, " + + " a.decimal_col1 DECIMAL(31, 10), " + + " a.date1 DATE, " + + " b.varchar_col2 VARCHAR, " + + " b.char_col2 CHAR(10), " + + " b.int_col2 INTEGER, " + + " b.long_col2 BIGINT, " + + " b.decimal_col2 DECIMAL(31, 10), " + + " b.date2 DATE " + + " CONSTRAINT pk PRIMARY KEY (varchar_pk, char_pk, int_pk, long_pk DESC, decimal_pk, date_pk)) "; + private static final Map<String,String> tableDDLMap; private static final Logger logger = LoggerFactory.getLogger(BaseTest.class); - + private static ZKClientService zkClient; + private static TransactionService txService; + @ClassRule + public static TemporaryFolder tmpFolder = new TemporaryFolder(); + static { ImmutableMap.Builder<String,String> builder = ImmutableMap.builder(); builder.put(ENTITY_HISTORY_TABLE_NAME,"create table " + ENTITY_HISTORY_TABLE_NAME + http://git-wip-us.apache.org/repos/asf/phoenix/blob/d10a5265/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java ---------------------------------------------------------------------- diff --cc phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java index 62f8d06,0fb9473..681b4e2 --- a/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java @@@ -101,9 -98,7 +101,7 @@@ public class TestUtil public static final String DEFAULT_INDEX_TABLE_NAME = "I"; public static final String DEFAULT_DATA_TABLE_FULL_NAME = SchemaUtil.getTableName(DEFAULT_SCHEMA_NAME, "T"); public static final String DEFAULT_INDEX_TABLE_FULL_NAME = SchemaUtil.getTableName(DEFAULT_SCHEMA_NAME, "I"); - + - public static final int NUM_MILLIS_IN_DAY = 86400000; - private TestUtil() { }
