Build failed in Jenkins: Phoenix | Master | Hadoop1 #307
See https://builds.apache.org/job/Phoenix-master-hadoop1/307/changes Changes: [jtaylor] PHOENIX-1131 PhoenixRuntime.encodePk needs to pad row key values to max column length (Samarth Jain) -- [...truncated 487 lines...] Tests run: 925, Failures: 0, Errors: 0, Skipped: 3 [INFO] [INFO] --- maven-failsafe-plugin:2.17:integration-test (HBaseManagedTimeTests) @ phoenix-core --- [INFO] Failsafe report directory: https://builds.apache.org/job/Phoenix-master-hadoop1/ws/phoenix-core/target/failsafe-reports [INFO] parallel='none', perCoreThreadCount=true, threadCount=0, useUnlimitedThreads=false, threadCountSuites=0, threadCountClasses=0, threadCountMethods=0, parallelOptimized=true --- T E S T S --- --- T E S T S --- Running org.apache.phoenix.end2end.BinaryRowKeyIT Running org.apache.phoenix.end2end.ExecuteStatementsIT Running org.apache.phoenix.trace.PhoenixTracingEndToEndIT Running org.apache.phoenix.trace.PhoenixTableMetricsWriterIT Running org.apache.phoenix.end2end.AutoCommitIT Running org.apache.phoenix.end2end.AlterTableIT Tests run: 4, Failures: 0, Errors: 0, Skipped: 4, Time elapsed: 0.144 sec - in org.apache.phoenix.trace.PhoenixTracingEndToEndIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 2, Time elapsed: 0.136 sec - in org.apache.phoenix.trace.PhoenixTableMetricsWriterIT Running org.apache.phoenix.end2end.EncodeFunctionIT Running org.apache.phoenix.end2end.FirstValueFunctionIT Running org.apache.phoenix.end2end.ServerExceptionIT Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.854 sec - in org.apache.phoenix.end2end.BinaryRowKeyIT Running org.apache.phoenix.end2end.PhoenixEncodeDecodeIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.54 sec - in org.apache.phoenix.end2end.AutoCommitIT Running org.apache.phoenix.end2end.index.DropViewIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.575 sec - in org.apache.phoenix.end2end.ServerExceptionIT Running org.apache.phoenix.end2end.index.ViewIndexIT Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.037 sec - in org.apache.phoenix.end2end.FirstValueFunctionIT Running org.apache.phoenix.end2end.index.IndexMetadataIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.595 sec - in org.apache.phoenix.end2end.index.DropViewIT Running org.apache.phoenix.end2end.index.ImmutableIndexIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.074 sec - in org.apache.phoenix.end2end.index.ViewIndexIT Running org.apache.phoenix.end2end.index.MutableIndexIT Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.238 sec - in org.apache.phoenix.end2end.EncodeFunctionIT Running org.apache.phoenix.end2end.index.SaltedIndexIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.722 sec - in org.apache.phoenix.end2end.ExecuteStatementsIT Running org.apache.phoenix.end2end.index.LocalIndexIT Tests run: 5, Failures: 0, Errors: 4, Skipped: 0, Time elapsed: 8.745 sec FAILURE! - in org.apache.phoenix.end2end.PhoenixEncodeDecodeIT testEncodeDecodeSalted(org.apache.phoenix.end2end.PhoenixEncodeDecodeIT) Time elapsed: 1.492 sec ERROR! java.lang.NullPointerException: null at org.apache.phoenix.util.PhoenixRuntime.encodePK(PhoenixRuntime.java:420) at org.apache.phoenix.end2end.PhoenixEncodeDecodeIT.testEncodeDecodeSalted(PhoenixEncodeDecodeIT.java:97) testEncodeDecodeMultiTenant(org.apache.phoenix.end2end.PhoenixEncodeDecodeIT) Time elapsed: 2.305 sec ERROR! java.lang.NullPointerException: null at org.apache.phoenix.util.PhoenixRuntime.encodePK(PhoenixRuntime.java:420) at org.apache.phoenix.end2end.PhoenixEncodeDecodeIT.testEncodeDecodeMultiTenant(PhoenixEncodeDecodeIT.java:136) testEncodeDecode(org.apache.phoenix.end2end.PhoenixEncodeDecodeIT) Time elapsed: 0.301 sec ERROR! java.lang.NullPointerException: null at org.apache.phoenix.util.PhoenixRuntime.encodePK(PhoenixRuntime.java:420) at org.apache.phoenix.end2end.PhoenixEncodeDecodeIT.testEncodeDecode(PhoenixEncodeDecodeIT.java:65) testEncodeDecodeSaltedMultiTenant(org.apache.phoenix.end2end.PhoenixEncodeDecodeIT) Time elapsed: 0.363 sec ERROR! java.lang.NullPointerException: null at org.apache.phoenix.util.PhoenixRuntime.encodePK(PhoenixRuntime.java:420) at org.apache.phoenix.end2end.PhoenixEncodeDecodeIT.testEncodeDecodeSaltedMultiTenant(PhoenixEncodeDecodeIT.java:175) Running org.apache.phoenix.end2end.MD5FunctionIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.381 sec - in org.apache.phoenix.end2end.MD5FunctionIT Running org.apache.phoenix.end2end.ReverseFunctionIT Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.272
git commit: PHOENIX-1131 Fix NPE in PhoenixRuntime.encodePk padding of row key values to max column length
Repository: phoenix Updated Branches: refs/heads/master eeac05afa - dd97d44e7 PHOENIX-1131 Fix NPE in PhoenixRuntime.encodePk padding of row key values to max column length Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/dd97d44e Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/dd97d44e Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/dd97d44e Branch: refs/heads/master Commit: dd97d44e779bc34c1edfb2bb3fd6dd91514d0113 Parents: eeac05a Author: James Taylor jtay...@salesforce.com Authored: Tue Jul 29 23:52:07 2014 -0700 Committer: James Taylor jtay...@salesforce.com Committed: Tue Jul 29 23:52:07 2014 -0700 -- .../src/main/java/org/apache/phoenix/schema/PDataType.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/dd97d44e/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java index bf0ba08..c2fcbf0 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java @@ -180,7 +180,7 @@ public enum PDataType { */ CHAR(CHAR, Types.CHAR, String.class, null) { // Delegate to VARCHAR @Override -public Object pad(Object object, int maxLength) { +public Object pad(Object object, Integer maxLength) { String s = (String) object; if (s == null) { return s; @@ -3124,7 +3124,7 @@ public enum PDataType { }, BINARY(BINARY, Types.BINARY, byte[].class, null) { @Override -public Object pad(Object object, int maxLength) { +public Object pad(Object object, Integer maxLength) { byte[] b = (byte[]) object; if (b == null) { return null; @@ -7132,7 +7132,7 @@ public enum PDataType { throw new UnsupportedOperationException(Operation not supported for type + this); } -public Object pad(Object object, int maxLength) { +public Object pad(Object object, Integer maxLength) { return object; }
Jenkins build is back to normal : Phoenix | Master | Hadoop1 #308
See https://builds.apache.org/job/Phoenix-master-hadoop1/308/changes
git commit: PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head of branch fails on backward compatibility
Repository: phoenix Updated Branches: refs/heads/3.0 ab785b401 - 2fb39574a PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head of branch fails on backward compatibility Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2fb39574 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2fb39574 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2fb39574 Branch: refs/heads/3.0 Commit: 2fb39574ab80d83028612935c7c86b8906fb7472 Parents: ab785b4 Author: James Taylor jtay...@salesforce.com Authored: Wed Jul 30 01:20:26 2014 -0700 Committer: James Taylor jtay...@salesforce.com Committed: Wed Jul 30 01:20:26 2014 -0700 -- .../org/apache/phoenix/join/HashJoinInfo.java | 23 +++- 1 file changed, 18 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2fb39574/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java b/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java index d00e802..ad96061 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java @@ -17,21 +17,25 @@ */ package org.apache.phoenix.join; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.EOFException; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.io.WritableUtils; - import org.apache.phoenix.expression.Expression; import org.apache.phoenix.expression.ExpressionType; import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.parse.JoinTableNode.JoinType; import org.apache.phoenix.schema.KeyValueSchema; +import org.apache.phoenix.schema.KeyValueSchema.KeyValueSchemaBuilder; import org.apache.phoenix.schema.PColumn; import org.apache.phoenix.schema.PTable; -import org.apache.phoenix.schema.KeyValueSchema.KeyValueSchemaBuilder; import org.apache.phoenix.util.SchemaUtil; public class HashJoinInfo { @@ -211,8 +215,17 @@ public class HashJoinInfo { postJoinFilterExpression = ExpressionType.values()[expressionOrdinal].newInstance(); postJoinFilterExpression.readFields(input); } -int limit = WritableUtils.readVInt(input); -boolean forceProjection = input.readBoolean(); +int limit = -1; +boolean forceProjection = false; +// Read these and ignore if we don't find them as they were not +// present in Apache Phoenix 3.0.0 release. This allows a newer +// 3.1 server to work with an older 3.0 client without force +// both to be upgraded in lock step. +try { +limit = WritableUtils.readVInt(input); +forceProjection = input.readBoolean(); +} catch (EOFException ignore) { +} return new HashJoinInfo(joinedSchema, joinIds, joinExpressions, joinTypes, earlyEvaluation, schemas, fieldPositions, postJoinFilterExpression, limit = 0 ? limit : null, forceProjection); } catch (IOException e) { throw new RuntimeException(e);
git commit: PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head of branch fails on backward compatibility
Repository: phoenix Updated Branches: refs/heads/4.0 bafac4166 - 32a4d4c2f PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head of branch fails on backward compatibility Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/32a4d4c2 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/32a4d4c2 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/32a4d4c2 Branch: refs/heads/4.0 Commit: 32a4d4c2f3f5c67ebdfdc94fb5ea935d58a6dc6b Parents: bafac41 Author: James Taylor jtay...@salesforce.com Authored: Wed Jul 30 01:20:26 2014 -0700 Committer: James Taylor jtay...@salesforce.com Committed: Wed Jul 30 01:21:17 2014 -0700 -- .../org/apache/phoenix/join/HashJoinInfo.java | 23 +++- 1 file changed, 18 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/32a4d4c2/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java b/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java index d00e802..ad96061 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/join/HashJoinInfo.java @@ -17,21 +17,25 @@ */ package org.apache.phoenix.join; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.EOFException; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.io.WritableUtils; - import org.apache.phoenix.expression.Expression; import org.apache.phoenix.expression.ExpressionType; import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr; import org.apache.phoenix.parse.JoinTableNode.JoinType; import org.apache.phoenix.schema.KeyValueSchema; +import org.apache.phoenix.schema.KeyValueSchema.KeyValueSchemaBuilder; import org.apache.phoenix.schema.PColumn; import org.apache.phoenix.schema.PTable; -import org.apache.phoenix.schema.KeyValueSchema.KeyValueSchemaBuilder; import org.apache.phoenix.util.SchemaUtil; public class HashJoinInfo { @@ -211,8 +215,17 @@ public class HashJoinInfo { postJoinFilterExpression = ExpressionType.values()[expressionOrdinal].newInstance(); postJoinFilterExpression.readFields(input); } -int limit = WritableUtils.readVInt(input); -boolean forceProjection = input.readBoolean(); +int limit = -1; +boolean forceProjection = false; +// Read these and ignore if we don't find them as they were not +// present in Apache Phoenix 3.0.0 release. This allows a newer +// 3.1 server to work with an older 3.0 client without force +// both to be upgraded in lock step. +try { +limit = WritableUtils.readVInt(input); +forceProjection = input.readBoolean(); +} catch (EOFException ignore) { +} return new HashJoinInfo(joinedSchema, joinIds, joinExpressions, joinTypes, earlyEvaluation, schemas, fieldPositions, postJoinFilterExpression, limit = 0 ? limit : null, forceProjection); } catch (IOException e) { throw new RuntimeException(e);
Apache-Phoenix | Master | Hadoop1 | Build Successful
Master branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-master-hadoop1/lastSuccessfulBuild/artifact/ Last Complete Test Report https://builds.apache.org/job/Phoenix-master-hadoop1/lastCompletedBuild/testReport/ Changes [jtaylor] PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head of branch fails on backward compatibility
Apache-Phoenix | 3.0 | Hadoop1 | Build Successful
3.0 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastSuccessfulBuild/artifact/ Last Complete Test Report https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastCompletedBuild/testReport/ Changes [jtaylor] PHOENIX-1130 SkipScanFilter gets IndexOutOfBoundsException when intersecting salted tables (Kyle Buzsaki) [jtaylor] PHOENIX-1131 PhoenixRuntime.encodePk needs to pad row key values to max column length (Samarth Jain) [jtaylor] PHOENIX-1131 Fix NPE in PhoenixRuntime.encodePk padding of row key values to max column length [jtaylor] PHOENIX-981 Joins using Phoenix client on v.3.0.0 and server 3.0 head of branch fails on backward compatibility
Apache-Phoenix | 3.0 | Hadoop1 | Build Successful
3.0 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastSuccessfulBuild/artifact/ Last Complete Test Report https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastCompletedBuild/testReport/ Changes [jtaylor] Remove unused imports
Jenkins build is back to normal : Phoenix | 4.0 | Hadoop1 #243
See https://builds.apache.org/job/Phoenix-4.0-hadoop1/243/
git commit: Fix apache-rat license warnings
Repository: phoenix Updated Branches: refs/heads/4.0 32a4d4c2f - b5e6ddcff Fix apache-rat license warnings Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b5e6ddcf Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b5e6ddcf Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b5e6ddcf Branch: refs/heads/4.0 Commit: b5e6ddcff18d438a67d5f82e0da421cc42368d2e Parents: 32a4d4c Author: Mujtaba mujt...@apache.org Authored: Wed Jul 30 11:42:20 2014 -0700 Committer: Mujtaba mujt...@apache.org Committed: Wed Jul 30 11:42:20 2014 -0700 -- .../org/apache/phoenix/end2end/InListIT.java | 19 ++- .../phoenix/schema/LocalIndexDataColumnRef.java | 17 + pom.xml | 2 ++ 3 files changed, 37 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5e6ddcf/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java index c257ccb..524d494 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.phoenix.end2end; import static java.util.Collections.singletonList; @@ -404,4 +421,4 @@ public class InListIT extends BaseHBaseManagedTimeIT { testWithIntegerTypesWithVariedSaltingAndTenancy(DEFAULT_UPSERT_BODIES, whereClause, expecteds); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5e6ddcf/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java index 16fe1a5..362d59f 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/LocalIndexDataColumnRef.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.phoenix.schema; import java.sql.SQLException; http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5e6ddcf/pom.xml -- diff --git a/pom.xml b/pom.xml index 77765cc..5642ad6 100644 --- a/pom.xml +++ b/pom.xml @@ -182,6 +182,8 @@ excludedev/release_files/**/exclude exclude**/target/**/exclude exclude**/resources/*.Driver/exclude + exclude**/META-INF/**/exclude + exclude**/*.properties/exclude exclude**/*.versionsBackup/exclude !-- exclude docs -- excludedocs/**/exclude
git commit: Fix apache-rat license warnings
Repository: phoenix Updated Branches: refs/heads/3.0 2f557ab5f - a16ef59c1 Fix apache-rat license warnings Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a16ef59c Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a16ef59c Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a16ef59c Branch: refs/heads/3.0 Commit: a16ef59c10d69245cb4397fc5cf83cd1183a443f Parents: 2f557ab Author: Mujtaba mujt...@apache.org Authored: Wed Jul 30 11:43:07 2014 -0700 Committer: Mujtaba mujt...@apache.org Committed: Wed Jul 30 11:43:07 2014 -0700 -- .../org/apache/phoenix/end2end/InListIT.java | 19 ++- 1 file changed, 18 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a16ef59c/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java index c257ccb..524d494 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.phoenix.end2end; import static java.util.Collections.singletonList; @@ -404,4 +421,4 @@ public class InListIT extends BaseHBaseManagedTimeIT { testWithIntegerTypesWithVariedSaltingAndTenancy(DEFAULT_UPSERT_BODIES, whereClause, expecteds); } -} \ No newline at end of file +}
[1/2] git commit: PHOENIX-1133 Skip scan intersect method not reseting state correctly
Repository: phoenix Updated Branches: refs/heads/3.0 a16ef59c1 - 9eb935cdf PHOENIX-1133 Skip scan intersect method not reseting state correctly Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8cde1d17 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8cde1d17 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8cde1d17 Branch: refs/heads/3.0 Commit: 8cde1d173b5b1a6e02d3c6e9caaae9d8ffcb4f28 Parents: 2f557ab Author: James Taylor jtay...@salesforce.com Authored: Wed Jul 30 11:44:42 2014 -0700 Committer: James Taylor jtay...@salesforce.com Committed: Wed Jul 30 11:44:42 2014 -0700 -- .../src/main/java/org/apache/phoenix/execute/ScanPlan.java | 6 +++--- .../main/java/org/apache/phoenix/filter/SkipScanFilter.java | 9 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/8cde1d17/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java index a994067..03deca7 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java @@ -18,6 +18,9 @@ package org.apache.phoenix.execute; +import java.sql.SQLException; +import java.util.List; + import org.apache.phoenix.compile.GroupByCompiler.GroupBy; import org.apache.phoenix.compile.OrderByCompiler.OrderBy; import org.apache.phoenix.compile.RowProjector; @@ -44,9 +47,6 @@ import org.apache.phoenix.schema.SaltingUtil; import org.apache.phoenix.schema.TableRef; import org.apache.phoenix.util.ScanUtil; -import java.sql.SQLException; -import java.util.List; - /** http://git-wip-us.apache.org/repos/asf/phoenix/blob/8cde1d17/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java b/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java index 3245bc5..e3b8d22 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java @@ -147,10 +147,15 @@ public class SkipScanFilter extends FilterBase { return true; } +private void resetState() { +isDone = false; +endKeyLength = 0; +Arrays.fill(position, 0); +} + private boolean intersect(byte[] lowerInclusiveKey, byte[] upperExclusiveKey, ListListKeyRange newSlots) { +resetState(); boolean lowerUnbound = (lowerInclusiveKey.length == 0); -Arrays.fill(position, 0); -isDone = false; int startPos = 0; int lastSlot = slots.size()-1; if (!lowerUnbound) {
git commit: Phoenix-950: Improve Secondary Index Update Failure Handling - addendum
Repository: phoenix Updated Branches: refs/heads/master 3d69fa211 - a8113ac0d Phoenix-950: Improve Secondary Index Update Failure Handling - addendum Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a8113ac0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a8113ac0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a8113ac0 Branch: refs/heads/master Commit: a8113ac0def2ef7d76af35afab509dc6ce6b624d Parents: 3d69fa2 Author: Jeffrey Zhong jeffr...@apache.org Authored: Wed Jul 30 16:00:32 2014 -0700 Committer: Jeffrey Zhong jeffr...@apache.org Committed: Wed Jul 30 16:00:32 2014 -0700 -- pom.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a8113ac0/pom.xml -- diff --git a/pom.xml b/pom.xml index 4612d70..f8843af 100644 --- a/pom.xml +++ b/pom.xml @@ -695,6 +695,11 @@ /dependency dependency groupIdorg.apache.hbase/groupId +artifactIdhbase-common/artifactId +version${hbase-hadoop2.version}/version + /dependency + dependency +groupIdorg.apache.hbase/groupId artifactIdhbase-client/artifactId version${hbase-hadoop2.version}/version /dependency
git commit: Phoenix-950: Improve Secondary Index Update Failure Handling - addendum
Repository: phoenix Updated Branches: refs/heads/4.0 b39e678a4 - 00216d46c Phoenix-950: Improve Secondary Index Update Failure Handling - addendum Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/00216d46 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/00216d46 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/00216d46 Branch: refs/heads/4.0 Commit: 00216d46c189b8cf8b2e33607da196276e613ed6 Parents: b39e678 Author: Jeffrey Zhong jeffr...@apache.org Authored: Wed Jul 30 16:00:32 2014 -0700 Committer: Jeffrey Zhong jeffr...@apache.org Committed: Wed Jul 30 16:02:00 2014 -0700 -- pom.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/00216d46/pom.xml -- diff --git a/pom.xml b/pom.xml index 1cd3b48..cacf5a0 100644 --- a/pom.xml +++ b/pom.xml @@ -695,6 +695,11 @@ /dependency dependency groupIdorg.apache.hbase/groupId +artifactIdhbase-common/artifactId +version${hbase-hadoop2.version}/version + /dependency + dependency +groupIdorg.apache.hbase/groupId artifactIdhbase-client/artifactId version${hbase-hadoop2.version}/version /dependency