phoenix git commit: PHOENIX-3827 Make use of HBASE-15600 to write local index mutations along with data mutations atomically(Rajeshbabu)

2017-05-23 Thread rajeshbabu 
Repository: phoenix
Updated Branches:
  refs/heads/master dfb2586af -> a2f4d7eeb


PHOENIX-3827 Make use of HBASE-15600 to write local index mutations along with 
data mutations atomically(Rajeshbabu)


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

Branch: refs/heads/master
Commit: a2f4d7eebec621b58204a9eb78d552f18dcbcf24
Parents: dfb2586
Author: Rajeshbabu Chintaguntla 
Authored: Wed May 24 11:21:12 2017 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Wed May 24 11:21:12 2017 +0530

--
 .../end2end/IndexToolForPartialBuildIT.java | 41 +++
 ...olForPartialBuildWithNamespaceEnabledIT.java | 13 ++--
 .../end2end/index/MutableIndexFailureIT.java|  6 +-
 .../org/apache/phoenix/hbase/index/Indexer.java | 72 +++-
 4 files changed, 45 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a2f4d7ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java
index 59a9106..83bda64 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java
@@ -64,9 +64,6 @@ import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.StringUtil;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -74,16 +71,12 @@ import com.google.common.collect.Maps;
 /**
  * Tests for the {@link IndexToolForPartialBuildIT}
  */
-@RunWith(Parameterized.class)
 public class IndexToolForPartialBuildIT extends BaseOwnClusterIT {
 
-private final boolean localIndex;
 protected boolean isNamespaceEnabled = false;
 protected final String tableDDLOptions;
 
-public IndexToolForPartialBuildIT(boolean localIndex) {
-
-this.localIndex = localIndex;
+public IndexToolForPartialBuildIT() {
 StringBuilder optionBuilder = new StringBuilder();
 optionBuilder.append(" SPLIT ON(1,2)");
 this.tableDDLOptions = optionBuilder.toString();
@@ -108,13 +101,6 @@ public class IndexToolForPartialBuildIT extends 
BaseOwnClusterIT {
 setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
ReadOnlyProps.EMPTY_PROPS);
 }
 
-@Parameters(name="localIndex = {0}")
-public static Collection data() {
-return Arrays.asList(new Boolean[][] { 
- { false},{ true }
-   });
-}
-
 @Test
 public void testSecondaryIndex() throws Exception {
 String schemaName = generateUniqueName();
@@ -142,8 +128,7 @@ public class IndexToolForPartialBuildIT extends 
BaseOwnClusterIT {
 upsertRow(stmt1, 2000);
 
 conn.commit();
-stmt.execute(String.format("CREATE %s INDEX %s ON %s  
(LPAD(UPPER(NAME),11,'x')||'_xyz') ",
-(localIndex ? "LOCAL" : ""), indxTable, fullTableName));
+stmt.execute(String.format("CREATE INDEX %s ON %s  
(LPAD(UPPER(NAME),11,'x')||'_xyz') ", indxTable, fullTableName));
 FailingRegionObserver.FAIL_WRITE = true;
 upsertRow(stmt1, 3000);
 upsertRow(stmt1, 4000);
@@ -186,7 +171,7 @@ public class IndexToolForPartialBuildIT extends 
BaseOwnClusterIT {
 String actualExplainPlan = QueryUtil.getExplainPlan(rs);
 
 // assert we are pulling from data table.
-   assertExplainPlan(actualExplainPlan, schemaName, 
dataTableName, null, false, isNamespaceEnabled);
+   assertExplainPlan(actualExplainPlan, schemaName, 
dataTableName, null, isNamespaceEnabled);
 
 rs = stmt1.executeQuery(selectSql);
 for (int i = 1; i <= 7; i++) {
@@ -219,7 +204,7 @@ public class IndexToolForPartialBuildIT extends 
BaseOwnClusterIT {
 // assert we are pulling from index table.
 rs = conn.createStatement().executeQuery("EXPLAIN " + selectSql);
 actualExplainPlan = QueryUtil.getExplainPlan(rs);
-assertExplainPlan(actualExplainPlan, schemaName, dataTableName, 
indxTable, localIndex, isNamespaceEnabled);
+

Build failed in Jenkins: Phoenix-4.x-HBase-1.1 #399

2017-05-23 Thread Apache Jenkins Server 
See 


Changes:

[gjacoby] PHOENIX-3878 Add license headers missed in PHOENIX-3572

--
[...truncated 41.06 KB...]
Tests run: 24, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.775 sec - in 
org.apache.phoenix.index.IndexMaintainerTest
Running org.apache.phoenix.expression.ILikeExpressionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.577 sec - in 
org.apache.phoenix.expression.RegexpSplitFunctionTest
Running org.apache.phoenix.expression.SignFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 sec - in 
org.apache.phoenix.expression.SignFunctionTest
Running org.apache.phoenix.expression.NullValueTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.656 sec - in 
org.apache.phoenix.expression.GetSetByteBitFunctionTest
Running org.apache.phoenix.expression.ArrayToStringFunctionTest
Tests run: 24, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.048 sec - in 
org.apache.phoenix.expression.ArrayToStringFunctionTest
Running org.apache.phoenix.expression.RoundFloorCeilExpressionsTest
Tests run: 37, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.136 sec - in 
org.apache.phoenix.expression.ArrayPrependFunctionTest
Running org.apache.phoenix.expression.RegexpSubstrFunctionTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.876 sec - in 
org.apache.phoenix.expression.ILikeExpressionTest
Running org.apache.phoenix.expression.OctetLengthFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.044 sec - in 
org.apache.phoenix.expression.OctetLengthFunctionTest
Running org.apache.phoenix.expression.CoerceExpressionTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 sec - in 
org.apache.phoenix.expression.CoerceExpressionTest
Running org.apache.phoenix.expression.SortOrderExpressionTest
Tests run: 24, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.068 sec - in 
org.apache.phoenix.expression.SortOrderExpressionTest
Running org.apache.phoenix.expression.ArrayConstructorExpressionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec - in 
org.apache.phoenix.expression.ArrayConstructorExpressionTest
Running org.apache.phoenix.expression.PowerFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.033 sec - in 
org.apache.phoenix.expression.PowerFunctionTest
Running org.apache.phoenix.expression.function.ExternalSqlTypeIdFunctionTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec - in 
org.apache.phoenix.expression.function.ExternalSqlTypeIdFunctionTest
Running org.apache.phoenix.expression.function.BuiltinFunctionConstructorTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.126 sec - in 
org.apache.phoenix.expression.function.BuiltinFunctionConstructorTest
Running org.apache.phoenix.expression.function.InstrFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec - in 
org.apache.phoenix.expression.function.InstrFunctionTest
Running org.apache.phoenix.expression.ArrayFillFunctionTest
Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.04 sec - in 
org.apache.phoenix.expression.ArrayFillFunctionTest
Running org.apache.phoenix.expression.RegexpReplaceFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.524 sec - in 
org.apache.phoenix.expression.RegexpSubstrFunctionTest
Running org.apache.phoenix.expression.SqrtFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.096 sec - in 
org.apache.phoenix.expression.RegexpReplaceFunctionTest
Running org.apache.phoenix.expression.CbrtFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.024 sec - in 
org.apache.phoenix.expression.SqrtFunctionTest
Running org.apache.phoenix.expression.LnLogFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.028 sec - in 
org.apache.phoenix.expression.CbrtFunctionTest
Running org.apache.phoenix.expression.ColumnExpressionTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec - in 
org.apache.phoenix.expression.ColumnExpressionTest
Running org.apache.phoenix.expression.AbsFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.067 sec - in 
org.apache.phoenix.expression.LnLogFunctionTest
Running org.apache.phoenix.expression.StringToArrayFunctionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.042 sec - in 
org.apache.phoenix.expression.AbsFunctionTest
Running org.apache.phoenix.query.ConnectionQueryServicesImplTest
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.35 sec - in 
org.apache.phoenix.jdbc.SecureUserConnectionsTest
Running org.apache.phoenix.query.OrderByTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.218 sec - in

Apache-Phoenix | 4.x-HBase-1.0 | Build Successful

2017-05-23 Thread Apache Jenkins Server 
4.x-HBase-1.0 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.0

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.0/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.0/lastCompletedBuild/testReport/

Changes
[gjacoby] PHOENIX-3877 - Connection throttling doesn't always decrement on



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Jenkins build is back to normal : Phoenix | Master #1620

2017-05-23 Thread Apache Jenkins Server 
See

Apache-Phoenix | 4.x-HBase-0.98 | Build Successful

2017-05-23 Thread Apache Jenkins Server 
4.x-HBase-0.98 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-0.98

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastCompletedBuild/testReport/

Changes
[gjacoby] PHOENIX-3877 - Connection throttling doesn't always decrement on



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Build failed in Jenkins: Phoenix-4.x-HBase-1.2 #11

2017-05-23 Thread Apache Jenkins Server 
See 


Changes:

[gjacoby] PHOENIX-3877 - Connection throttling doesn't always decrement on

--
[...truncated 74.63 KB...]
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.31 sec - in 
org.apache.phoenix.end2end.index.SaltedIndexIT
Running org.apache.phoenix.end2end.index.ViewIndexIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 315.92 sec - 
in org.apache.phoenix.end2end.index.DropColumnIT
Running org.apache.phoenix.end2end.index.txn.MutableRollbackIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 48.823 sec - in 
org.apache.phoenix.end2end.index.ViewIndexIT
Running org.apache.phoenix.end2end.index.txn.RollbackIT
Tests run: 99, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1,073.592 sec 
- in org.apache.phoenix.end2end.HashJoinIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 54.758 sec - in 
org.apache.phoenix.end2end.index.txn.RollbackIT
Running org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 69.555 sec - in 
org.apache.phoenix.end2end.index.txn.MutableRollbackIT
Running org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.261 sec - in 
org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
Running org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.744 sec - in 
org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
Running org.apache.phoenix.iterate.RoundRobinResultIteratorIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.234 sec - in 
org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
Running org.apache.phoenix.replication.SystemCatalogWALEntryFilterIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.067 sec - in 
org.apache.phoenix.replication.SystemCatalogWALEntryFilterIT
Running org.apache.phoenix.rpc.UpdateCacheIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.646 sec - in 
org.apache.phoenix.rpc.UpdateCacheIT
Running org.apache.phoenix.trace.PhoenixTraceReaderIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.605 sec - in 
org.apache.phoenix.trace.PhoenixTraceReaderIT
Running org.apache.phoenix.tx.FlappingTransactionIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 50.038 sec - in 
org.apache.phoenix.iterate.RoundRobinResultIteratorIT
Running org.apache.phoenix.tx.ParameterizedTransactionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.37 sec - in 
org.apache.phoenix.tx.FlappingTransactionIT
Running org.apache.phoenix.tx.TransactionIT
Running org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.547 sec - in 
org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
Running org.apache.phoenix.tx.TxCheckpointIT
Tests run: 67, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 459.426 sec - 
in org.apache.phoenix.end2end.index.IndexExpressionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 52.865 sec - in 
org.apache.phoenix.tx.TransactionIT
Tests run: 64, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 484.663 sec - 
in org.apache.phoenix.end2end.index.MutableIndexIT
Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 685.987 sec - 
in org.apache.phoenix.end2end.UpgradeIT
Tests run: 52, Failures: 0, Errors: 0, Skipped: 4, Time elapsed: 221.914 sec - 
in org.apache.phoenix.tx.ParameterizedTransactionIT
Tests run: 102, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1,105.063 sec 
- in org.apache.phoenix.end2end.SortMergeJoinIT

Results :

Tests run: 1701, Failures: 0, Errors: 0, Skipped: 4

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(ClientManagedTimeTests) @ phoenix-core ---

---
 T E S T S
---
Running org.apache.phoenix.end2end.CreateSchemaIT
Running org.apache.phoenix.end2end.CreateTableIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.425 sec - in 
org.apache.phoenix.end2end.CreateSchemaIT
Running org.apache.phoenix.end2end.ColumnProjectionOptimizationIT
Running org.apache.phoenix.end2end.CustomEntityDataIT
Running org.apache.phoenix.end2end.ArrayIT
Running org.apache.phoenix.end2end.ClientTimeArithmeticQueryIT
Running org.apache.phoenix.end2end.AggregateQueryIT
Running org.apache.phoenix.end2end.CastAndCoerceIT
Running org.apache.phoenix.end2end.CaseStatementIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.992 sec - in 
org.apache.phoenix.end2end.CustomEntityDataIT
Running org.apache.phoenix.end2end.DerivedTableIT
Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.884 sec - 
in

phoenix git commit: PHOENIX-3878 Add license headers missed in PHOENIX-3572

2017-05-23 Thread gjacoby 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 e2a19898f -> e0ed3e34c


PHOENIX-3878 Add license headers missed in PHOENIX-3572

Signed-off-by: gjacoby 


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

Branch: refs/heads/4.x-HBase-1.1
Commit: e0ed3e34c0a353e5aac39fa3e5ca93ca9b83048a
Parents: e2a1989
Author: Biju Nair 
Authored: Tue May 23 15:48:43 2017 -0400
Committer: gjacoby 
Committed: Tue May 23 16:45:56 2017 -0700

--
 .../apache/phoenix/execute/CursorFetchPlan.java   | 18 ++
 .../java/org/apache/phoenix/parse/CursorName.java | 18 ++
 2 files changed, 36 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e0ed3e34/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
index aaea13e..cf0a3cf 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
@@ -1,3 +1,21 @@
+/*
+ * 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.execute;
 
 import java.sql.SQLException;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e0ed3e34/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java 
b/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
index 5b9de76..737573c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
@@ -1,3 +1,21 @@
+/*
+ * 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.parse;
 
 import org.apache.phoenix.util.SchemaUtil;

phoenix git commit: PHOENIX-3877 - Connection throttling doesn't always decrement on connection close

2017-05-23 Thread gjacoby 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 a96fafcea -> e2a19898f


PHOENIX-3877 - Connection throttling doesn't always decrement on connection 
close


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

Branch: refs/heads/4.x-HBase-1.1
Commit: e2a19898f52cafcb541169cc143ca89e8ee36dad
Parents: a96fafc
Author: gjacoby 
Authored: Tue May 23 10:02:54 2017 -0700
Committer: gjacoby 
Committed: Tue May 23 16:45:20 2017 -0700

--
 .../phoenix/monitoring/PhoenixMetricsIT.java| 28 +---
 .../query/ConnectionQueryServicesImpl.java  | 11 +++-
 2 files changed, 34 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e2a19898/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
index 04d125a..2838f04 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
@@ -36,6 +36,7 @@ import static 
org.apache.phoenix.util.PhoenixRuntime.TENANT_ID_ATTRIB;
 import static org.apache.phoenix.util.PhoenixRuntime.UPSERT_BATCH_SIZE_ATTRIB;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -856,14 +857,15 @@ public class PhoenixMetricsIT extends 
BaseUniqueNamesOwnClusterIT {
 
 @Test
 public void testGetConnectionsThrottledForSameUrl() throws Exception {
-int expectedPhoenixConnections = 11;
+int attemptedPhoenixConnections = 11;
+int maxConnections = attemptedPhoenixConnections -1;
 List connections = Lists.newArrayList();
 String zkQuorum = "localhost:" + 
getUtility().getZkCluster().getClientPort();
 String url = PhoenixRuntime.JDBC_PROTOCOL + 
PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum +
 ':' +  CUSTOM_URL_STRING + '=' + "throttletest";
 
 Properties props = new Properties();
-
props.setProperty(QueryServices.CLIENT_CONNECTION_MAX_ALLOWED_CONNECTIONS, 
"10");
+
props.setProperty(QueryServices.CLIENT_CONNECTION_MAX_ALLOWED_CONNECTIONS, 
Integer.toString(maxConnections));
 
 GLOBAL_HCONNECTIONS_COUNTER.getMetric().reset();
 GLOBAL_QUERY_SERVICES_COUNTER.getMetric().reset();
@@ -871,7 +873,7 @@ public class PhoenixMetricsIT extends 
BaseUniqueNamesOwnClusterIT {
 GLOBAL_PHOENIX_CONNECTIONS_THROTTLED_COUNTER.getMetric().reset();
 boolean wasThrottled = false;
 try {
-for (int k = 0; k < expectedPhoenixConnections; k++) {
+for (int k = 0; k < attemptedPhoenixConnections; k++) {
 connections.add(DriverManager.getConnection(url, props));
 }
 } catch (SQLException se) {
@@ -885,7 +887,25 @@ public class PhoenixMetricsIT extends 
BaseUniqueNamesOwnClusterIT {
 assertEquals(1, GLOBAL_QUERY_SERVICES_COUNTER.getMetric().getValue());
 assertTrue("No connection was throttled!", wasThrottled);
 assertEquals(1, 
GLOBAL_PHOENIX_CONNECTIONS_THROTTLED_COUNTER.getMetric().getValue());
-assertEquals(expectedPhoenixConnections, 
GLOBAL_PHOENIX_CONNECTIONS_ATTEMPTED_COUNTER.getMetric().getValue());
+assertEquals(maxConnections, connections.size());
+assertTrue("Not all connections were attempted!",
+attemptedPhoenixConnections <= 
GLOBAL_PHOENIX_CONNECTIONS_ATTEMPTED_COUNTER.getMetric().getValue());
+connections.clear();
+//now check that we decremented the counter for the connections we 
just released
+try {
+for (int k = 0; k < maxConnections; k++){
+connections.add(DriverManager.getConnection(url, props));
+}
+} catch(SQLException se) {
+if (se.getErrorCode() == 
(SQLExceptionCode.NEW_CONNECTION_THROTTLED).getErrorCode()){
+fail("Connection was throttled when it shouldn't be!");
+}
+} finally {
+for (Connection c : connections) {
+c.close();
+}
+}
+assertEquals(maxConnections, connections.size());
 }
 
 @Test

phoenix git commit: PHOENIX-3877 - Connection throttling doesn't always decrement on connection close

2017-05-23 Thread gjacoby 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 7bd90621c -> aae94a053


PHOENIX-3877 - Connection throttling doesn't always decrement on connection 
close


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

Branch: refs/heads/4.x-HBase-1.2
Commit: aae94a053ff97141c6cd64573e38634c4b7f629f
Parents: 7bd9062
Author: gjacoby 
Authored: Tue May 23 10:02:54 2017 -0700
Committer: gjacoby 
Committed: Tue May 23 16:02:03 2017 -0700

--
 .../phoenix/monitoring/PhoenixMetricsIT.java| 28 +---
 .../query/ConnectionQueryServicesImpl.java  | 11 +++-
 2 files changed, 34 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/aae94a05/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
index 04d125a..2838f04 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
@@ -36,6 +36,7 @@ import static 
org.apache.phoenix.util.PhoenixRuntime.TENANT_ID_ATTRIB;
 import static org.apache.phoenix.util.PhoenixRuntime.UPSERT_BATCH_SIZE_ATTRIB;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -856,14 +857,15 @@ public class PhoenixMetricsIT extends 
BaseUniqueNamesOwnClusterIT {
 
 @Test
 public void testGetConnectionsThrottledForSameUrl() throws Exception {
-int expectedPhoenixConnections = 11;
+int attemptedPhoenixConnections = 11;
+int maxConnections = attemptedPhoenixConnections -1;
 List connections = Lists.newArrayList();
 String zkQuorum = "localhost:" + 
getUtility().getZkCluster().getClientPort();
 String url = PhoenixRuntime.JDBC_PROTOCOL + 
PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum +
 ':' +  CUSTOM_URL_STRING + '=' + "throttletest";
 
 Properties props = new Properties();
-
props.setProperty(QueryServices.CLIENT_CONNECTION_MAX_ALLOWED_CONNECTIONS, 
"10");
+
props.setProperty(QueryServices.CLIENT_CONNECTION_MAX_ALLOWED_CONNECTIONS, 
Integer.toString(maxConnections));
 
 GLOBAL_HCONNECTIONS_COUNTER.getMetric().reset();
 GLOBAL_QUERY_SERVICES_COUNTER.getMetric().reset();
@@ -871,7 +873,7 @@ public class PhoenixMetricsIT extends 
BaseUniqueNamesOwnClusterIT {
 GLOBAL_PHOENIX_CONNECTIONS_THROTTLED_COUNTER.getMetric().reset();
 boolean wasThrottled = false;
 try {
-for (int k = 0; k < expectedPhoenixConnections; k++) {
+for (int k = 0; k < attemptedPhoenixConnections; k++) {
 connections.add(DriverManager.getConnection(url, props));
 }
 } catch (SQLException se) {
@@ -885,7 +887,25 @@ public class PhoenixMetricsIT extends 
BaseUniqueNamesOwnClusterIT {
 assertEquals(1, GLOBAL_QUERY_SERVICES_COUNTER.getMetric().getValue());
 assertTrue("No connection was throttled!", wasThrottled);
 assertEquals(1, 
GLOBAL_PHOENIX_CONNECTIONS_THROTTLED_COUNTER.getMetric().getValue());
-assertEquals(expectedPhoenixConnections, 
GLOBAL_PHOENIX_CONNECTIONS_ATTEMPTED_COUNTER.getMetric().getValue());
+assertEquals(maxConnections, connections.size());
+assertTrue("Not all connections were attempted!",
+attemptedPhoenixConnections <= 
GLOBAL_PHOENIX_CONNECTIONS_ATTEMPTED_COUNTER.getMetric().getValue());
+connections.clear();
+//now check that we decremented the counter for the connections we 
just released
+try {
+for (int k = 0; k < maxConnections; k++){
+connections.add(DriverManager.getConnection(url, props));
+}
+} catch(SQLException se) {
+if (se.getErrorCode() == 
(SQLExceptionCode.NEW_CONNECTION_THROTTLED).getErrorCode()){
+fail("Connection was throttled when it shouldn't be!");
+}
+} finally {
+for (Connection c : connections) {
+c.close();
+}
+}
+assertEquals(maxConnections, connections.size());
 }
 
 @Test

phoenix git commit: PHOENIX-3877 - Connection throttling doesn't always decrement on connection close

2017-05-23 Thread gjacoby 
Repository: phoenix
Updated Branches:
  refs/heads/master 33d6cdab1 -> dfb2586af


PHOENIX-3877 - Connection throttling doesn't always decrement on connection 
close


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

Branch: refs/heads/master
Commit: dfb2586aff0541fd596350823512500b86e932e1
Parents: 33d6cda
Author: gjacoby 
Authored: Tue May 23 10:02:54 2017 -0700
Committer: gjacoby 
Committed: Tue May 23 15:56:53 2017 -0700

--
 .../phoenix/monitoring/PhoenixMetricsIT.java| 28 +---
 .../query/ConnectionQueryServicesImpl.java  | 11 +++-
 2 files changed, 34 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/dfb2586a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
index 04d125a..2838f04 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
@@ -36,6 +36,7 @@ import static 
org.apache.phoenix.util.PhoenixRuntime.TENANT_ID_ATTRIB;
 import static org.apache.phoenix.util.PhoenixRuntime.UPSERT_BATCH_SIZE_ATTRIB;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -856,14 +857,15 @@ public class PhoenixMetricsIT extends 
BaseUniqueNamesOwnClusterIT {
 
 @Test
 public void testGetConnectionsThrottledForSameUrl() throws Exception {
-int expectedPhoenixConnections = 11;
+int attemptedPhoenixConnections = 11;
+int maxConnections = attemptedPhoenixConnections -1;
 List connections = Lists.newArrayList();
 String zkQuorum = "localhost:" + 
getUtility().getZkCluster().getClientPort();
 String url = PhoenixRuntime.JDBC_PROTOCOL + 
PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum +
 ':' +  CUSTOM_URL_STRING + '=' + "throttletest";
 
 Properties props = new Properties();
-
props.setProperty(QueryServices.CLIENT_CONNECTION_MAX_ALLOWED_CONNECTIONS, 
"10");
+
props.setProperty(QueryServices.CLIENT_CONNECTION_MAX_ALLOWED_CONNECTIONS, 
Integer.toString(maxConnections));
 
 GLOBAL_HCONNECTIONS_COUNTER.getMetric().reset();
 GLOBAL_QUERY_SERVICES_COUNTER.getMetric().reset();
@@ -871,7 +873,7 @@ public class PhoenixMetricsIT extends 
BaseUniqueNamesOwnClusterIT {
 GLOBAL_PHOENIX_CONNECTIONS_THROTTLED_COUNTER.getMetric().reset();
 boolean wasThrottled = false;
 try {
-for (int k = 0; k < expectedPhoenixConnections; k++) {
+for (int k = 0; k < attemptedPhoenixConnections; k++) {
 connections.add(DriverManager.getConnection(url, props));
 }
 } catch (SQLException se) {
@@ -885,7 +887,25 @@ public class PhoenixMetricsIT extends 
BaseUniqueNamesOwnClusterIT {
 assertEquals(1, GLOBAL_QUERY_SERVICES_COUNTER.getMetric().getValue());
 assertTrue("No connection was throttled!", wasThrottled);
 assertEquals(1, 
GLOBAL_PHOENIX_CONNECTIONS_THROTTLED_COUNTER.getMetric().getValue());
-assertEquals(expectedPhoenixConnections, 
GLOBAL_PHOENIX_CONNECTIONS_ATTEMPTED_COUNTER.getMetric().getValue());
+assertEquals(maxConnections, connections.size());
+assertTrue("Not all connections were attempted!",
+attemptedPhoenixConnections <= 
GLOBAL_PHOENIX_CONNECTIONS_ATTEMPTED_COUNTER.getMetric().getValue());
+connections.clear();
+//now check that we decremented the counter for the connections we 
just released
+try {
+for (int k = 0; k < maxConnections; k++){
+connections.add(DriverManager.getConnection(url, props));
+}
+} catch(SQLException se) {
+if (se.getErrorCode() == 
(SQLExceptionCode.NEW_CONNECTION_THROTTLED).getErrorCode()){
+fail("Connection was throttled when it shouldn't be!");
+}
+} finally {
+for (Connection c : connections) {
+c.close();
+}
+}
+assertEquals(maxConnections, connections.size());
 }
 
 @Test

Apache-Phoenix | 4.x-HBase-1.2 | Build Successful

2017-05-23 Thread Apache Jenkins Server 
4.x-HBase-1.2 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.2

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.2/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.2/lastCompletedBuild/testReport/

Changes
[gjacoby] PHOENIX-3878 Add license headers missed in PHOENIX-3572



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Jenkins build is back to normal : Phoenix | 4.x-HBase-0.98 #1505

2017-05-23 Thread Apache Jenkins Server 
See

phoenix git commit: PHOENIX-3878 Add license headers missed in PHOENIX-3572

2017-05-23 Thread gjacoby 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 0215115de -> 7bd90621c


PHOENIX-3878 Add license headers missed in PHOENIX-3572

Signed-off-by: gjacoby 


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

Branch: refs/heads/4.x-HBase-1.2
Commit: 7bd90621c534b2fc2a6e3bed31552bb597f3f86d
Parents: 0215115
Author: Biju Nair 
Authored: Tue May 23 15:48:43 2017 -0400
Committer: gjacoby 
Committed: Tue May 23 13:55:57 2017 -0700

--
 .../apache/phoenix/execute/CursorFetchPlan.java   | 18 ++
 .../java/org/apache/phoenix/parse/CursorName.java | 18 ++
 2 files changed, 36 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7bd90621/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
index aaea13e..cf0a3cf 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
@@ -1,3 +1,21 @@
+/*
+ * 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.execute;
 
 import java.sql.SQLException;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7bd90621/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java 
b/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
index 5b9de76..737573c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
@@ -1,3 +1,21 @@
+/*
+ * 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.parse;
 
 import org.apache.phoenix.util.SchemaUtil;

phoenix git commit: PHOENIX-3878 Add license headers missed in PHOENIX-3572

2017-05-23 Thread gjacoby 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 7c0741b71 -> ca20d3a28


PHOENIX-3878 Add license headers missed in PHOENIX-3572

Signed-off-by: gjacoby 


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

Branch: refs/heads/4.x-HBase-0.98
Commit: ca20d3a284838aaf3489a8fe5ee72c71a27d5eba
Parents: 7c0741b
Author: Biju Nair 
Authored: Tue May 23 15:48:43 2017 -0400
Committer: gjacoby 
Committed: Tue May 23 13:54:09 2017 -0700

--
 .../apache/phoenix/execute/CursorFetchPlan.java   | 18 ++
 .../java/org/apache/phoenix/parse/CursorName.java | 18 ++
 2 files changed, 36 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ca20d3a2/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
index aaea13e..cf0a3cf 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
@@ -1,3 +1,21 @@
+/*
+ * 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.execute;
 
 import java.sql.SQLException;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ca20d3a2/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java 
b/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
index 5b9de76..737573c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
@@ -1,3 +1,21 @@
+/*
+ * 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.parse;
 
 import org.apache.phoenix.util.SchemaUtil;

phoenix git commit: PHOENIX-3878 Add license headers missed in PHOENIX-3572

2017-05-23 Thread gjacoby 
Repository: phoenix
Updated Branches:
  refs/heads/master 4471b8792 -> 33d6cdab1


PHOENIX-3878 Add license headers missed in PHOENIX-3572

Signed-off-by: gjacoby 


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

Branch: refs/heads/master
Commit: 33d6cdab1e5eed336b7a6f56d3ebaa741893bc43
Parents: 4471b87
Author: Biju Nair 
Authored: Tue May 23 15:48:43 2017 -0400
Committer: gjacoby 
Committed: Tue May 23 13:49:48 2017 -0700

--
 .../apache/phoenix/execute/CursorFetchPlan.java   | 18 ++
 .../java/org/apache/phoenix/parse/CursorName.java | 18 ++
 2 files changed, 36 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/33d6cdab/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
index aaea13e..cf0a3cf 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/CursorFetchPlan.java
@@ -1,3 +1,21 @@
+/*
+ * 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.execute;
 
 import java.sql.SQLException;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/33d6cdab/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java 
b/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
index 5b9de76..737573c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/parse/CursorName.java
@@ -1,3 +1,21 @@
+/*
+ * 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.parse;
 
 import org.apache.phoenix.util.SchemaUtil;

Jenkins build is back to normal : Phoenix-4.x-HBase-1.1 #397

2017-05-23 Thread Apache Jenkins Server 
See

Build failed in Jenkins: Phoenix | Master #1618

2017-05-23 Thread Apache Jenkins Server 
See 


Changes:

[jamestaylor] PHOENIX-3869 Keep index failure policies the same for 4.x branches

--
[...truncated 73.93 KB...]
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.325 sec - in 
org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
Running org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.324 sec - in 
org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
Running org.apache.phoenix.iterate.RoundRobinResultIteratorIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 334.214 sec - 
in org.apache.phoenix.end2end.index.MutableIndexSplitForwardScanIT
Running org.apache.phoenix.replication.SystemCatalogWALEntryFilterIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.089 sec - in 
org.apache.phoenix.replication.SystemCatalogWALEntryFilterIT
Running org.apache.phoenix.rpc.UpdateCacheIT
Tests run: 67, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 413.346 sec - 
in org.apache.phoenix.end2end.index.IndexExpressionIT
Running org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.657 sec - in 
org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
Running org.apache.phoenix.trace.PhoenixTraceReaderIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 27.715 sec - in 
org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
Running org.apache.phoenix.tx.FlappingTransactionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.733 sec - in 
org.apache.phoenix.trace.PhoenixTraceReaderIT
Running org.apache.phoenix.tx.ParameterizedTransactionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.119 sec - in 
org.apache.phoenix.tx.FlappingTransactionIT
Running org.apache.phoenix.tx.TransactionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.957 sec - in 
org.apache.phoenix.rpc.UpdateCacheIT
Running org.apache.phoenix.tx.TxCheckpointIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 49.746 sec - in 
org.apache.phoenix.iterate.RoundRobinResultIteratorIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 42.148 sec - in 
org.apache.phoenix.tx.TransactionIT
Tests run: 64, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 450.967 sec - 
in org.apache.phoenix.end2end.index.MutableIndexIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 364.68 sec - in 
org.apache.phoenix.end2end.index.MutableIndexSplitReverseScanIT
Tests run: 102, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 962.845 sec - 
in org.apache.phoenix.end2end.SortMergeJoinIT
Tests run: 52, Failures: 0, Errors: 0, Skipped: 4, Time elapsed: 200.3 sec - in 
org.apache.phoenix.tx.ParameterizedTransactionIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 293.462 sec - 
in org.apache.phoenix.tx.TxCheckpointIT
Tests run: 304, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1,892.27 sec 
- in org.apache.phoenix.end2end.index.IndexIT

Results :

Tests run: 2045, Failures: 0, Errors: 0, Skipped: 4

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(ClientManagedTimeTests) @ phoenix-core ---

---
 T E S T S
---
Running org.apache.phoenix.end2end.ArrayIT
Running org.apache.phoenix.end2end.ColumnProjectionOptimizationIT
Running org.apache.phoenix.end2end.CreateTableIT
Running org.apache.phoenix.end2end.CreateSchemaIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.89 sec - in 
org.apache.phoenix.end2end.CreateSchemaIT
Running org.apache.phoenix.end2end.CustomEntityDataIT
Running org.apache.phoenix.end2end.CastAndCoerceIT
Running org.apache.phoenix.end2end.CaseStatementIT
Running org.apache.phoenix.end2end.AggregateQueryIT
Running org.apache.phoenix.end2end.ClientTimeArithmeticQueryIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.079 sec - in 
org.apache.phoenix.end2end.CustomEntityDataIT
Running org.apache.phoenix.end2end.DerivedTableIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 31.807 sec - in 
org.apache.phoenix.end2end.ColumnProjectionOptimizationIT
Running org.apache.phoenix.end2end.DistinctCountIT
Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 36.361 sec - 
in org.apache.phoenix.end2end.DerivedTableIT
Running org.apache.phoenix.end2end.DropSchemaIT
Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.167 sec - 
in org.apache.phoenix.end2end.DistinctCountIT
Running org.apache.phoenix.end2end.ExtendedQueryExecIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.411 sec - in 
org.apache.phoenix.end2end.ExtendedQueryExecIT
Running org.apache.phoenix.end2end.FunkyNamesIT
Tests run: 2, Failures: 0, Errors: 0,

Build failed in Jenkins: Phoenix | 4.x-HBase-0.98 #1504

2017-05-23 Thread Apache Jenkins Server 
See 


Changes:

[jamestaylor] PHOENIX-3869 Keep index failure policies the same for 4.x branches

--
[...truncated 76.48 KB...]
 T E S T S
---
Running org.apache.phoenix.end2end.ArrayIT
Running org.apache.phoenix.end2end.ClientTimeArithmeticQueryIT
Running org.apache.phoenix.end2end.CaseStatementIT
Running org.apache.phoenix.end2end.CastAndCoerceIT
Running org.apache.phoenix.end2end.AggregateQueryIT
Tests run: 80, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 57.669 sec - 
in org.apache.phoenix.end2end.ArrayIT
Running org.apache.phoenix.end2end.ColumnProjectionOptimizationIT
Tests run: 49, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 55.833 sec - 
in org.apache.phoenix.end2end.CastAndCoerceIT
Running org.apache.phoenix.end2end.CreateSchemaIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.266 sec - in 
org.apache.phoenix.end2end.CreateSchemaIT
Running org.apache.phoenix.end2end.CreateTableIT
Tests run: 56, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 57.607 sec - 
in org.apache.phoenix.end2end.CaseStatementIT
Running org.apache.phoenix.end2end.CustomEntityDataIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.958 sec - in 
org.apache.phoenix.end2end.CustomEntityDataIT
Running org.apache.phoenix.end2end.DerivedTableIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.975 sec - in 
org.apache.phoenix.end2end.ColumnProjectionOptimizationIT
Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.464 sec - 
in org.apache.phoenix.end2end.DerivedTableIT
Running org.apache.phoenix.end2end.DistinctCountIT
Running org.apache.phoenix.end2end.DropSchemaIT
Tests run: 42, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 74.584 sec - 
in org.apache.phoenix.end2end.AggregateQueryIT
Running org.apache.phoenix.end2end.ExtendedQueryExecIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.559 sec - in 
org.apache.phoenix.end2end.DropSchemaIT
Running org.apache.phoenix.end2end.FunkyNamesIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.055 sec - in 
org.apache.phoenix.end2end.ExtendedQueryExecIT
Running org.apache.phoenix.end2end.GroupByIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.695 sec - in 
org.apache.phoenix.end2end.FunkyNamesIT
Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.903 sec - 
in org.apache.phoenix.end2end.DistinctCountIT
Running org.apache.phoenix.end2end.MutableQueryIT
Running org.apache.phoenix.end2end.NativeHBaseTypesIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.668 sec - in 
org.apache.phoenix.end2end.NativeHBaseTypesIT
Running org.apache.phoenix.end2end.NotQueryIT
Tests run: 245, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 131.281 sec - 
in org.apache.phoenix.end2end.ClientTimeArithmeticQueryIT
Tests run: 91, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 50.939 sec - 
in org.apache.phoenix.end2end.GroupByIT
Running org.apache.phoenix.end2end.PointInTimeQueryIT
Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 78.689 sec - 
in org.apache.phoenix.end2end.CreateTableIT
Running org.apache.phoenix.end2end.ProductMetricsIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.368 sec - in 
org.apache.phoenix.end2end.PointInTimeQueryIT
Running org.apache.phoenix.end2end.QueryIT
Tests run: 77, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 64.363 sec - 
in org.apache.phoenix.end2end.NotQueryIT
Running org.apache.phoenix.end2end.QueryDatabaseMetaDataIT
Tests run: 61, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.276 sec - 
in org.apache.phoenix.end2end.ProductMetricsIT
Running org.apache.phoenix.end2end.ReadIsolationLevelIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.46 sec - in 
org.apache.phoenix.end2end.ReadIsolationLevelIT
Running org.apache.phoenix.end2end.RowValueConstructorIT
Running org.apache.phoenix.end2end.ScanQueryIT
Tests run: 112, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 126.177 sec - 
in org.apache.phoenix.end2end.MutableQueryIT
Tests run: 112, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 57.502 sec - 
in org.apache.phoenix.end2end.QueryIT
Tests run: 46, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 67.375 sec - 
in org.apache.phoenix.end2end.RowValueConstructorIT
Tests run: 112, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 47.369 sec - 
in org.apache.phoenix.end2end.ScanQueryIT
Tests run: 19, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 79.533 sec - 
in org.apache.phoenix.end2end.QueryDatabaseMetaDataIT
Running org.apache.phoenix.end2end.TopNIT
Running org.apache.phoenix.end2end.SequenceBulkAllocationIT
Running org.apache.phoenix.end2end.TruncateFunctionIT
Running org.apache.phoenix.end2end.SequenceIT
Tests run: 1, Failures: 0, Errors: 0,

phoenix git commit: PHOENIX-3869 Keep index failure policies the same for 4.x branches

2017-05-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 e746c225e -> 0215115de


PHOENIX-3869 Keep index failure policies the same for 4.x branches


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

Branch: refs/heads/4.x-HBase-1.2
Commit: 0215115de865fbfc6e894138b50efd93435ce9d5
Parents: e746c22
Author: James Taylor 
Authored: Mon May 22 17:50:44 2017 -0700
Committer: James Taylor 
Committed: Tue May 23 10:53:45 2017 -0700

--
 .../phoenix/end2end/index/MutableIndexFailureIT.java  | 14 +++---
 .../apache/phoenix/query/QueryServicesOptions.java|  2 +-
 .../org/apache/phoenix/schema/MetaDataClient.java |  6 --
 3 files changed, 8 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/0215115d/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index 11573a5..853647e 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -119,7 +119,7 @@ public class MutableIndexFailureIT extends BaseTest {
 this.fullIndexName = SchemaUtil.getTableName(schema, indexName);
 this.isNamespaceMapped = isNamespaceMapped;
 this.leaveIndexActiveOnFailure = ! (disableIndexOnWriteFailure == null 
? QueryServicesOptions.DEFAULT_INDEX_FAILURE_DISABLE_INDEX : 
disableIndexOnWriteFailure);
-this.rebuildIndexOnWriteFailure = 
Boolean.TRUE.equals(rebuildIndexOnWriteFailure);
+this.rebuildIndexOnWriteFailure = ! 
Boolean.FALSE.equals(rebuildIndexOnWriteFailure);
 }
 
 @BeforeClass
@@ -146,13 +146,13 @@ public class MutableIndexFailureIT extends BaseTest {
 { true, false, false, true, true }, 
 { true, false, true, true, true },
 { false, true, true, true, true }, 
-{ false, true, false, true, true }, 
-{ true, true, false, true, true }, 
-{ true, true, true, true, true },
+{ false, true, false, null, null }, 
+{ true, true, false, true, null }, 
+{ true, true, true, null, true },
 
-{ false, false, false, null, true }, 
-{ false, true, false, false, true }, 
-{ false, false, false, false, null }, 
+{ false, false, false, false, true }, 
+{ false, true, false, false, null }, 
+{ false, false, false, false, false }, 
 } 
 );
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/0215115d/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index 5541dcf..35eda60 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -168,7 +168,7 @@ public class QueryServicesOptions {
 public static final int DEFAULT_CLOCK_SKEW_INTERVAL = 2000;
 public static final boolean DEFAULT_INDEX_FAILURE_HANDLING_REBUILD = true; 
// auto rebuild on
 public static final boolean DEFAULT_INDEX_FAILURE_BLOCK_WRITE = false; 
-public static final boolean DEFAULT_INDEX_FAILURE_DISABLE_INDEX = false; 
+public static final boolean DEFAULT_INDEX_FAILURE_DISABLE_INDEX = true; 
 public static final long DEFAULT_INDEX_FAILURE_HANDLING_REBUILD_INTERVAL = 
6; // 60 secs
 public static final long 
DEFAULT_INDEX_FAILURE_HANDLING_REBUILD_OVERLAP_TIME = 1; // 1 ms
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/0215115d/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 1254d79..24f3848 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++

phoenix git commit: PHOENIX-3869 Keep index failure policies the same for 4.x branches

2017-05-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 f5a2f6d76 -> 7c0741b71


PHOENIX-3869 Keep index failure policies the same for 4.x branches


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 7c0741b717f231a3d9dde182a5a88005880bb2c8
Parents: f5a2f6d
Author: James Taylor 
Authored: Mon May 22 17:50:44 2017 -0700
Committer: James Taylor 
Committed: Tue May 23 10:51:06 2017 -0700

--
 .../phoenix/end2end/index/MutableIndexFailureIT.java  | 14 +++---
 .../apache/phoenix/query/QueryServicesOptions.java|  2 +-
 .../org/apache/phoenix/schema/MetaDataClient.java |  6 --
 3 files changed, 8 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7c0741b7/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index d9dca1e..9b11c0a 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -121,7 +121,7 @@ public class MutableIndexFailureIT extends BaseTest {
 this.fullIndexName = SchemaUtil.getTableName(schema, indexName);
 this.isNamespaceMapped = isNamespaceMapped;
 this.leaveIndexActiveOnFailure = ! (disableIndexOnWriteFailure == null 
? QueryServicesOptions.DEFAULT_INDEX_FAILURE_DISABLE_INDEX : 
disableIndexOnWriteFailure);
-this.rebuildIndexOnWriteFailure = 
Boolean.TRUE.equals(rebuildIndexOnWriteFailure);
+this.rebuildIndexOnWriteFailure = ! 
Boolean.FALSE.equals(rebuildIndexOnWriteFailure);
 }
 
 @BeforeClass
@@ -148,13 +148,13 @@ public class MutableIndexFailureIT extends BaseTest {
 { true, false, false, true, true }, 
 { true, false, true, true, true },
 { false, true, true, true, true }, 
-{ false, true, false, true, true }, 
-{ true, true, false, true, true }, 
-{ true, true, true, true, true },
+{ false, true, false, null, null }, 
+{ true, true, false, true, null }, 
+{ true, true, true, null, true },
 
-{ false, false, false, null, true }, 
-{ false, true, false, false, true }, 
-{ false, false, false, false, null }, 
+{ false, false, false, false, true }, 
+{ false, true, false, false, null }, 
+{ false, false, false, false, false }, 
 } 
 );
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7c0741b7/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index b9c01f3..ef8d1ab 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -167,7 +167,7 @@ public class QueryServicesOptions {
 public static final int DEFAULT_CLOCK_SKEW_INTERVAL = 2000;
 public static final boolean DEFAULT_INDEX_FAILURE_HANDLING_REBUILD = true; 
// auto rebuild on
 public static final boolean DEFAULT_INDEX_FAILURE_BLOCK_WRITE = false; 
-public static final boolean DEFAULT_INDEX_FAILURE_DISABLE_INDEX = false; 
+public static final boolean DEFAULT_INDEX_FAILURE_DISABLE_INDEX = true; 
 public static final long DEFAULT_INDEX_FAILURE_HANDLING_REBUILD_INTERVAL = 
6; // 60 secs
 public static final long 
DEFAULT_INDEX_FAILURE_HANDLING_REBUILD_OVERLAP_TIME = 1; // 1 ms
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7c0741b7/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 fcb647d..ed5cd3a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++

phoenix git commit: PHOENIX-3869 Keep index failure policies the same for 4.x branches

2017-05-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master e27fae931 -> 4471b8792


PHOENIX-3869 Keep index failure policies the same for 4.x branches


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

Branch: refs/heads/master
Commit: 4471b87926094b71aff12c384f4fc60f87ff2915
Parents: e27fae9
Author: James Taylor 
Authored: Mon May 22 17:50:44 2017 -0700
Committer: James Taylor 
Committed: Tue May 23 10:49:54 2017 -0700

--
 .../phoenix/end2end/index/MutableIndexFailureIT.java  | 14 +++---
 .../apache/phoenix/query/QueryServicesOptions.java|  2 +-
 .../org/apache/phoenix/schema/MetaDataClient.java |  6 --
 3 files changed, 8 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4471b879/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index 11573a5..853647e 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -119,7 +119,7 @@ public class MutableIndexFailureIT extends BaseTest {
 this.fullIndexName = SchemaUtil.getTableName(schema, indexName);
 this.isNamespaceMapped = isNamespaceMapped;
 this.leaveIndexActiveOnFailure = ! (disableIndexOnWriteFailure == null 
? QueryServicesOptions.DEFAULT_INDEX_FAILURE_DISABLE_INDEX : 
disableIndexOnWriteFailure);
-this.rebuildIndexOnWriteFailure = 
Boolean.TRUE.equals(rebuildIndexOnWriteFailure);
+this.rebuildIndexOnWriteFailure = ! 
Boolean.FALSE.equals(rebuildIndexOnWriteFailure);
 }
 
 @BeforeClass
@@ -146,13 +146,13 @@ public class MutableIndexFailureIT extends BaseTest {
 { true, false, false, true, true }, 
 { true, false, true, true, true },
 { false, true, true, true, true }, 
-{ false, true, false, true, true }, 
-{ true, true, false, true, true }, 
-{ true, true, true, true, true },
+{ false, true, false, null, null }, 
+{ true, true, false, true, null }, 
+{ true, true, true, null, true },
 
-{ false, false, false, null, true }, 
-{ false, true, false, false, true }, 
-{ false, false, false, false, null }, 
+{ false, false, false, false, true }, 
+{ false, true, false, false, null }, 
+{ false, false, false, false, false }, 
 } 
 );
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4471b879/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index 5541dcf..35eda60 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -168,7 +168,7 @@ public class QueryServicesOptions {
 public static final int DEFAULT_CLOCK_SKEW_INTERVAL = 2000;
 public static final boolean DEFAULT_INDEX_FAILURE_HANDLING_REBUILD = true; 
// auto rebuild on
 public static final boolean DEFAULT_INDEX_FAILURE_BLOCK_WRITE = false; 
-public static final boolean DEFAULT_INDEX_FAILURE_DISABLE_INDEX = false; 
+public static final boolean DEFAULT_INDEX_FAILURE_DISABLE_INDEX = true; 
 public static final long DEFAULT_INDEX_FAILURE_HANDLING_REBUILD_INTERVAL = 
6; // 60 secs
 public static final long 
DEFAULT_INDEX_FAILURE_HANDLING_REBUILD_OVERLAP_TIME = 1; // 1 ms
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4471b879/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 1254d79..24f3848 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++

Build failed in Jenkins: Phoenix Compile Compatibility with HBase #297

2017-05-23 Thread Apache Jenkins Server 
See 


--
Started by timer
[EnvInject] - Loading node environment variables.
Building remotely on qnode3 (ubuntu) in workspace 

[Phoenix_Compile_Compat_wHBase] $ /bin/bash /tmp/hudson4019438940246079298.sh
core file size  (blocks, -c) 0
data seg size   (kbytes, -d) unlimited
scheduling priority (-e) 0
file size   (blocks, -f) unlimited
pending signals (-i) 128341
max locked memory   (kbytes, -l) 64
max memory size (kbytes, -m) unlimited
open files  (-n) 6
pipe size(512 bytes, -p) 8
POSIX message queues (bytes, -q) 819200
real-time priority  (-r) 0
stack size  (kbytes, -s) 8192
cpu time   (seconds, -t) unlimited
max user processes  (-u) 10240
virtual memory  (kbytes, -v) unlimited
file locks  (-x) unlimited
core id : 0
core id : 1
core id : 2
core id : 3
core id : 4
core id : 5
core id : 6
core id : 7
physical id : 0
MemTotal:   32865152 kB
MemFree:11142556 kB
Filesystem  Size  Used Avail Use% Mounted on
none 16G 0   16G   0% /dev
tmpfs   3.2G  342M  2.9G  11% /run
/dev/nbd046G   30G   14G  70% /
tmpfs16G 0   16G   0% /dev/shm
tmpfs   5.0M 0  5.0M   0% /run/lock
tmpfs16G 0   16G   0% /sys/fs/cgroup
/dev/sda1   235G  126G   98G  57% /home
tmpfs   3.2G 0  3.2G   0% /run/user/9997
apache-maven-2.2.1
apache-maven-3.0.4
apache-maven-3.0.5
apache-maven-3.2.1
apache-maven-3.2.5
apache-maven-3.3.3
apache-maven-3.3.9
latest
latest2
latest3


===
Verifying compile level compatibility with HBase 0.98 with Phoenix 
4.x-HBase-0.98
===

Cloning into 'hbase'...
Switched to a new branch '0.98'
Branch 0.98 set up to track remote branch 0.98 from origin.

main:
 [exec] 
~/jenkins-slave/workspace/Phoenix_Compile_Compat_wHBase/hbase/hbase-common 
~/jenkins-slave/workspace/Phoenix_Compile_Compat_wHBase/hbase/hbase-common
 [exec] 
~/jenkins-slave/workspace/Phoenix_Compile_Compat_wHBase/hbase/hbase-common

main:
[mkdir] Created dir: 

 [exec] tar: hadoop-snappy-nativelibs.tar: Cannot open: No such file or 
directory
 [exec] tar: Error is not recoverable: exiting now
 [exec] Result: 2

main:
[mkdir] Created dir: 

 [copy] Copying 20 files to 

[mkdir] Created dir: 

[mkdir] Created dir: 


main:
[mkdir] Created dir: 

 [copy] Copying 17 files to 

[mkdir] Created dir: 


main:
[mkdir] Created dir: 

 [copy] Copying 1 file to 

[mkdir] Created dir: 


HBase pom.xml:

Got HBase version as 0.98.25-SNAPSHOT
Cloning into 'phoenix'...
Switched to a new branch '4.x-HBase-0.98'
Branch 4.x-HBase-0.98 set up to track remote branch 4.x-HBase-0.98 from origin.
ANTLR Parser Generator  Version 3.5.2
Output file 

 does not exist: must build 

PhoenixSQL.g


===
Verifying compile level compatibility with HBase branch-1.3 with Phoenix