[5/5] phoenix git commit: PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain)
PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e5033aec Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e5033aec Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e5033aec Branch: refs/heads/master Commit: e5033aec18849a305c06bdeb5dcf6eda9b369f49 Parents: 83b5bb4 Author: James Taylor jtay...@salesforce.com Authored: Tue Nov 25 13:43:55 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Tue Nov 25 13:43:55 2014 -0800 -- ...ReplayWithIndexWritesAndCompressedWALIT.java | 3 + .../apache/phoenix/end2end/AlterTableIT.java| 3 +- .../phoenix/end2end/ArithmeticQueryIT.java | 3 +- .../org/apache/phoenix/end2end/ArrayIT.java | 2 - .../apache/phoenix/end2end/AutoCommitIT.java| 3 +- .../BaseOwnClusterClientManagedTimeIT.java | 3 +- .../BaseOwnClusterHBaseManagedTimeIT.java | 3 +- .../org/apache/phoenix/end2end/BaseQueryIT.java | 2 - .../end2end/BaseTenantSpecificTablesIT.java | 3 +- .../end2end/BaseTenantSpecificViewIndexIT.java | 1 + .../org/apache/phoenix/end2end/BaseViewIT.java | 3 +- .../apache/phoenix/end2end/BinaryRowKeyIT.java | 3 +- .../phoenix/end2end/CSVCommonsLoaderIT.java | 3 +- .../apache/phoenix/end2end/CaseStatementIT.java | 2 - .../apache/phoenix/end2end/CastAndCoerceIT.java | 2 - .../end2end/ClientTimeArithmeticQueryIT.java| 3 +- .../phoenix/end2end/CoalesceFunctionIT.java | 3 +- .../end2end/ColumnProjectionOptimizationIT.java | 4 +- .../phoenix/end2end/CompareDecimalToLongIT.java | 3 +- .../end2end/ConvertTimezoneFunctionIT.java | 3 +- .../end2end/CountDistinctCompressionIT.java | 3 +- .../apache/phoenix/end2end/CreateTableIT.java | 3 +- .../phoenix/end2end/CustomEntityDataIT.java | 3 +- .../phoenix/end2end/DecodeFunctionIT.java | 3 +- .../org/apache/phoenix/end2end/DeleteIT.java| 3 +- .../apache/phoenix/end2end/DerivedTableIT.java | 3 +- .../apache/phoenix/end2end/DistinctCountIT.java | 3 +- .../apache/phoenix/end2end/DynamicColumnIT.java | 4 +- .../apache/phoenix/end2end/DynamicFamilyIT.java | 4 +- .../apache/phoenix/end2end/DynamicUpsertIT.java | 3 +- .../phoenix/end2end/EvaluationOfORIT.java | 3 +- .../phoenix/end2end/ExecuteStatementsIT.java| 3 +- .../phoenix/end2end/ExtendedQueryExecIT.java| 3 +- .../phoenix/end2end/FirstValueFunctionIT.java | 11 +- .../apache/phoenix/end2end/FunkyNamesIT.java| 3 +- .../apache/phoenix/end2end/GroupByCaseIT.java | 3 +- .../org/apache/phoenix/end2end/GroupByIT.java | 3 +- .../org/apache/phoenix/end2end/HashJoinIT.java | 3 +- .../org/apache/phoenix/end2end/InListIT.java| 4 +- .../phoenix/end2end/InMemoryOrderByIT.java | 3 +- .../org/apache/phoenix/end2end/IsNullIT.java| 3 +- .../org/apache/phoenix/end2end/KeyOnlyIT.java | 3 +- .../phoenix/end2end/LastValueFunctionIT.java| 3 +- .../apache/phoenix/end2end/LpadFunctionIT.java | 3 +- .../apache/phoenix/end2end/MD5FunctionIT.java | 3 +- .../phoenix/end2end/MappingTableDataTypeIT.java | 3 +- .../phoenix/end2end/ModulusExpressionIT.java| 5 +- .../phoenix/end2end/MultiCfQueryExecIT.java | 3 +- .../phoenix/end2end/NativeHBaseTypesIT.java | 3 +- .../org/apache/phoenix/end2end/NotQueryIT.java | 3 +- .../phoenix/end2end/NthValueFunctionIT.java | 3 +- .../org/apache/phoenix/end2end/OrderByIT.java | 3 +- .../phoenix/end2end/ParallelIteratorsIT.java| 3 +- .../apache/phoenix/end2end/PercentileIT.java| 3 +- .../phoenix/end2end/ProductMetricsIT.java | 3 +- .../end2end/QueryDatabaseMetaDataIT.java| 3 +- .../phoenix/end2end/QueryExecWithoutSCNIT.java | 3 +- .../org/apache/phoenix/end2end/QueryIT.java | 3 +- .../org/apache/phoenix/end2end/QueryMoreIT.java | 3 +- .../phoenix/end2end/QueryWithLimitIT.java | 3 +- .../phoenix/end2end/ReadIsolationLevelIT.java | 3 +- .../org/apache/phoenix/end2end/ReadOnlyIT.java | 3 +- .../phoenix/end2end/RegexpSplitFunctionIT.java | 3 +- .../phoenix/end2end/RegexpSubstrFunctionIT.java | 3 +- .../phoenix/end2end/ReverseFunctionIT.java | 3 +- .../apache/phoenix/end2end/ReverseScanIT.java | 3 +- .../RoundFloorCeilFunctionsEnd2EndIT.java | 3 +- .../phoenix/end2end/RowValueConstructorIT.java | 3 +- .../apache/phoenix/end2end/SaltedViewIT.java| 3 +- .../org/apache/phoenix/end2end/ScanQueryIT.java | 3 +- .../org/apache/phoenix/end2end/SequenceIT.java | 3 +- .../phoenix/end2end/ServerExceptionIT.java | 3 +- .../end2end/SkipScanAfterManualSplitIT.java | 3 +- .../apache/phoenix/end2end/SkipScanQueryIT.java | 3 +-
[2/5] phoenix git commit: Revert Upgrade to 4.12 Junit and update tests by removing @Category (Samarth Jain)
http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java index bb09793..c35ecab 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledOrderByIT.java @@ -22,8 +22,9 @@ import java.util.Map; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; +import org.junit.experimental.categories.Category; - +@Category(ClientManagedTimeTest.class) public class SpooledOrderByIT extends OrderByIT { @BeforeClass http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java index c646622..d602423 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java @@ -22,10 +22,11 @@ import java.util.Map; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; +import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; - +@Category(HBaseManagedTimeTest.class) public class SpooledSortMergeJoinIT extends SortMergeJoinIT { public SpooledSortMergeJoinIT(String[] indexDDL, String[] plans) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java deleted file mode 100644 index 4e3f54f..000 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * 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 org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.FileFilter; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -import org.apache.phoenix.query.QueryServices; -import org.junit.Before; -import org.junit.Test; - - - -public class SpooledTmpFileDeleteIT extends BaseClientManagedTimeIT { - private Connection conn = null; - private Properties props = null; - - @Before - public void setup() throws SQLException { - props = new Properties(); - props.put(QueryServices.SPOOL_DIRECTORY, /tmp); - props.setProperty(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, Integer.toString(1)); - conn = DriverManager.getConnection(getUrl(), props); - Statement stmt = conn.createStatement(); - stmt.execute(CREATE TABLE test (ID varchar NOT NULL PRIMARY KEY) SPLIT ON ('EA','EZ')); - stmt.execute(UPSERT INTO test VALUES ('AA')); - stmt.execute(UPSERT INTO test VALUES ('EB')); - stmt.execute(UPSERT INTO test VALUES ('FA')); - stmt.close(); - conn.commit(); - } - - @Test - public void testDeleteAllSpooledTmpFiles() throws SQLException, Throwable { - File dir = new File(/tmp); - File[] files = null; - - class FilenameFilter implements
[3/5] phoenix git commit: Revert Upgrade to 4.12 Junit and update tests by removing @Category (Samarth Jain)
Revert Upgrade to 4.12 Junit and update tests by removing @Category (Samarth Jain) This reverts commit 0398178617cb2aeac3661510395635b9d00f814d. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/83b5bb4f Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/83b5bb4f Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/83b5bb4f Branch: refs/heads/master Commit: 83b5bb4fa4b41510510e5be45142670ed01ec71b Parents: 0398178 Author: James Taylor jtay...@salesforce.com Authored: Tue Nov 25 13:42:15 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Tue Nov 25 13:42:15 2014 -0800 -- ...ReplayWithIndexWritesAndCompressedWALIT.java | 3 - .../apache/phoenix/end2end/AlterTableIT.java| 3 +- .../phoenix/end2end/ArithmeticQueryIT.java | 3 +- .../org/apache/phoenix/end2end/ArrayIT.java | 2 + .../apache/phoenix/end2end/AutoCommitIT.java| 3 +- .../BaseOwnClusterClientManagedTimeIT.java | 3 +- .../BaseOwnClusterHBaseManagedTimeIT.java | 3 +- .../org/apache/phoenix/end2end/BaseQueryIT.java | 2 + .../end2end/BaseTenantSpecificTablesIT.java | 3 +- .../end2end/BaseTenantSpecificViewIndexIT.java | 1 - .../org/apache/phoenix/end2end/BaseViewIT.java | 3 +- .../apache/phoenix/end2end/BinaryRowKeyIT.java | 3 +- .../phoenix/end2end/CSVCommonsLoaderIT.java | 3 +- .../apache/phoenix/end2end/CaseStatementIT.java | 2 + .../apache/phoenix/end2end/CastAndCoerceIT.java | 2 + .../end2end/ClientTimeArithmeticQueryIT.java| 3 +- .../phoenix/end2end/CoalesceFunctionIT.java | 3 +- .../end2end/ColumnProjectionOptimizationIT.java | 4 +- .../phoenix/end2end/CompareDecimalToLongIT.java | 3 +- .../end2end/ConvertTimezoneFunctionIT.java | 3 +- .../end2end/CountDistinctCompressionIT.java | 3 +- .../apache/phoenix/end2end/CreateTableIT.java | 3 +- .../phoenix/end2end/CustomEntityDataIT.java | 3 +- .../phoenix/end2end/DecodeFunctionIT.java | 3 +- .../org/apache/phoenix/end2end/DeleteIT.java| 3 +- .../apache/phoenix/end2end/DerivedTableIT.java | 3 +- .../apache/phoenix/end2end/DistinctCountIT.java | 3 +- .../apache/phoenix/end2end/DynamicColumnIT.java | 4 +- .../apache/phoenix/end2end/DynamicFamilyIT.java | 4 +- .../apache/phoenix/end2end/DynamicUpsertIT.java | 3 +- .../phoenix/end2end/EvaluationOfORIT.java | 3 +- .../phoenix/end2end/ExecuteStatementsIT.java| 3 +- .../phoenix/end2end/ExtendedQueryExecIT.java| 3 +- .../phoenix/end2end/FirstValueFunctionIT.java | 11 +- .../apache/phoenix/end2end/FunkyNamesIT.java| 3 +- .../apache/phoenix/end2end/GroupByCaseIT.java | 3 +- .../org/apache/phoenix/end2end/GroupByIT.java | 3 +- .../org/apache/phoenix/end2end/HashJoinIT.java | 3 +- .../org/apache/phoenix/end2end/InListIT.java| 4 +- .../phoenix/end2end/InMemoryOrderByIT.java | 3 +- .../org/apache/phoenix/end2end/IsNullIT.java| 3 +- .../org/apache/phoenix/end2end/KeyOnlyIT.java | 3 +- .../phoenix/end2end/LastValueFunctionIT.java| 3 +- .../apache/phoenix/end2end/LpadFunctionIT.java | 3 +- .../apache/phoenix/end2end/MD5FunctionIT.java | 3 +- .../phoenix/end2end/MappingTableDataTypeIT.java | 3 +- .../phoenix/end2end/ModulusExpressionIT.java| 5 +- .../phoenix/end2end/MultiCfQueryExecIT.java | 3 +- .../phoenix/end2end/NativeHBaseTypesIT.java | 3 +- .../org/apache/phoenix/end2end/NotQueryIT.java | 3 +- .../phoenix/end2end/NthValueFunctionIT.java | 3 +- .../org/apache/phoenix/end2end/OrderByIT.java | 3 +- .../phoenix/end2end/ParallelIteratorsIT.java| 3 +- .../apache/phoenix/end2end/PercentileIT.java| 3 +- .../phoenix/end2end/ProductMetricsIT.java | 3 +- .../end2end/QueryDatabaseMetaDataIT.java| 3 +- .../phoenix/end2end/QueryExecWithoutSCNIT.java | 3 +- .../org/apache/phoenix/end2end/QueryIT.java | 3 +- .../org/apache/phoenix/end2end/QueryMoreIT.java | 3 +- .../phoenix/end2end/QueryWithLimitIT.java | 3 +- .../phoenix/end2end/ReadIsolationLevelIT.java | 3 +- .../org/apache/phoenix/end2end/ReadOnlyIT.java | 3 +- .../phoenix/end2end/RegexpSplitFunctionIT.java | 3 +- .../phoenix/end2end/RegexpSubstrFunctionIT.java | 3 +- .../phoenix/end2end/ReverseFunctionIT.java | 3 +- .../apache/phoenix/end2end/ReverseScanIT.java | 3 +- .../RoundFloorCeilFunctionsEnd2EndIT.java | 3 +- .../phoenix/end2end/RowValueConstructorIT.java | 3 +- .../apache/phoenix/end2end/SaltedViewIT.java| 3 +- .../org/apache/phoenix/end2end/ScanQueryIT.java | 3 +- .../org/apache/phoenix/end2end/SequenceIT.java | 3 +- .../phoenix/end2end/ServerExceptionIT.java | 3 +- .../end2end/SkipScanAfterManualSplitIT.java | 3 +-
[1/5] phoenix git commit: Revert Upgrade to 4.12 Junit and update tests by removing @Category (Samarth Jain)
Repository: phoenix Updated Branches: refs/heads/master 039817861 - e5033aec1 http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java index a4901cf..be85635 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/DelegateColumn.java @@ -17,6 +17,10 @@ */ package org.apache.phoenix.schema; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; + import org.apache.phoenix.util.SizedUtil; public class DelegateColumn extends DelegateDatum implements PColumn { http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java b/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java index 159e0c9..265fc78 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/trace/PhoenixMetricsSink.java @@ -17,23 +17,12 @@ */ package org.apache.phoenix.trace; -import static org.apache.phoenix.metrics.MetricInfo.ANNOTATION; -import static org.apache.phoenix.metrics.MetricInfo.DESCRIPTION; -import static org.apache.phoenix.metrics.MetricInfo.END; -import static org.apache.phoenix.metrics.MetricInfo.HOSTNAME; -import static org.apache.phoenix.metrics.MetricInfo.PARENT; -import static org.apache.phoenix.metrics.MetricInfo.SPAN; -import static org.apache.phoenix.metrics.MetricInfo.START; -import static org.apache.phoenix.metrics.MetricInfo.TAG; -import static org.apache.phoenix.metrics.MetricInfo.TRACE; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Function; +import com.google.common.base.Joiner; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterators; +import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.SubsetConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,15 +31,20 @@ import org.apache.hadoop.metrics2.AbstractMetric; import org.apache.hadoop.metrics2.MetricsRecord; import org.apache.hadoop.metrics2.MetricsSink; import org.apache.hadoop.metrics2.MetricsTag; -import org.apache.phoenix.metrics.MetricInfo; -import org.apache.phoenix.metrics.Metrics; +import org.apache.phoenix.metrics.*; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.trace.util.Tracing; import org.apache.phoenix.util.QueryUtil; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Joiner; +import javax.annotation.Nullable; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.*; + +import static org.apache.phoenix.metrics.MetricInfo.*; +import static org.apache.phoenix.metrics.MetricInfo.HOSTNAME; /** * Write the metrics to a phoenix table. http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b5bb4f/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java -- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java index 375b754..3c8a6df 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/hbase/index/write/TestWALRecoveryCaching.java @@ -56,6 +56,7 @@ import org.apache.hadoop.hbase.regionserver.wal.HLogKey; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; +import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest; import org.apache.phoenix.hbase.index.IndexTestingUtils; import org.apache.phoenix.hbase.index.Indexer; import org.apache.phoenix.hbase.index.TableName; @@ -71,6 +72,7 @@ import org.junit.Assert; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import com.google.common.collect.Multimap;
[4/5] phoenix git commit: PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain)
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java index d602423..c646622 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledSortMergeJoinIT.java @@ -22,11 +22,10 @@ import java.util.Map; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; import com.google.common.collect.Maps; -@Category(HBaseManagedTimeTest.class) + public class SpooledSortMergeJoinIT extends SortMergeJoinIT { public SpooledSortMergeJoinIT(String[] indexDDL, String[] plans) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/e5033aec/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java new file mode 100644 index 000..a117c51 --- /dev/null +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SpooledTmpFileDeleteIT.java @@ -0,0 +1,124 @@ +/* + * 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 org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.FileFilter; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import org.apache.phoenix.query.QueryServices; +import org.junit.Before; +import org.junit.Test; + + + +public class SpooledTmpFileDeleteIT extends BaseHBaseManagedTimeIT { + private Connection conn = null; + private Properties props = null; + + @Before + public void setup() throws SQLException { + props = new Properties(); + props.put(QueryServices.SPOOL_DIRECTORY, /tmp); + props.setProperty(QueryServices.SPOOL_THRESHOLD_BYTES_ATTRIB, Integer.toString(1)); + conn = DriverManager.getConnection(getUrl(), props); + Statement stmt = conn.createStatement(); + stmt.execute(CREATE TABLE test (ID varchar NOT NULL PRIMARY KEY) SPLIT ON ('EA','EZ')); + stmt.execute(UPSERT INTO test VALUES ('AA')); + stmt.execute(UPSERT INTO test VALUES ('EB')); + stmt.execute(UPSERT INTO test VALUES ('FA')); + stmt.close(); + conn.commit(); + } + + @Test + public void testDeleteAllSpooledTmpFiles() throws SQLException, Throwable { + File dir = new File(/tmp); + File[] files = null; + + class FilenameFilter implements FileFilter { + @Override + public boolean accept(File dir) { + return dir.getName().toLowerCase().endsWith(.bin) + dir.getName().startsWith(ResultSpooler); + } + } + + FilenameFilter fnameFilter = new FilenameFilter(); + + // clean up first + files = dir.listFiles(fnameFilter); + for (File file : files) { + file.delete(); + } + + String query = select * from TEST; + Statement statement = conn.createStatement(); + ResultSet rs = statement.executeQuery(query); + assertTrue(rs.next()); + files = dir.listFiles(fnameFilter); + assertTrue(files.length 0); +
[2/2] phoenix git commit: PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain)
PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/448fb3dd Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/448fb3dd Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/448fb3dd Branch: refs/heads/4.2 Commit: 448fb3dd02fd663b5c9deb5b1fb237266c54e9e3 Parents: 2d7ea61 Author: James Taylor jtay...@salesforce.com Authored: Tue Nov 25 13:52:15 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Tue Nov 25 13:52:15 2014 -0800 -- ...ReplayWithIndexWritesAndCompressedWALIT.java | 3 + .../apache/phoenix/end2end/AlterTableIT.java| 3 +- .../phoenix/end2end/ArithmeticQueryIT.java | 3 +- .../org/apache/phoenix/end2end/ArrayIT.java | 2 - .../apache/phoenix/end2end/AutoCommitIT.java| 3 +- .../BaseOwnClusterClientManagedTimeIT.java | 3 +- .../BaseOwnClusterHBaseManagedTimeIT.java | 3 +- .../org/apache/phoenix/end2end/BaseQueryIT.java | 2 - .../end2end/BaseTenantSpecificTablesIT.java | 3 +- .../end2end/BaseTenantSpecificViewIndexIT.java | 1 + .../org/apache/phoenix/end2end/BaseViewIT.java | 3 +- .../apache/phoenix/end2end/BinaryRowKeyIT.java | 3 +- .../phoenix/end2end/CSVCommonsLoaderIT.java | 3 +- .../apache/phoenix/end2end/CaseStatementIT.java | 2 - .../apache/phoenix/end2end/CastAndCoerceIT.java | 2 - .../end2end/ClientTimeArithmeticQueryIT.java| 3 +- .../phoenix/end2end/CoalesceFunctionIT.java | 3 +- .../end2end/ColumnProjectionOptimizationIT.java | 2 - .../phoenix/end2end/CompareDecimalToLongIT.java | 3 +- .../end2end/ConvertTimezoneFunctionIT.java | 3 +- .../end2end/CountDistinctCompressionIT.java | 3 +- .../apache/phoenix/end2end/CreateTableIT.java | 3 +- .../phoenix/end2end/CustomEntityDataIT.java | 3 +- .../phoenix/end2end/DecodeFunctionIT.java | 3 +- .../org/apache/phoenix/end2end/DeleteIT.java| 3 +- .../apache/phoenix/end2end/DerivedTableIT.java | 2 - .../apache/phoenix/end2end/DistinctCountIT.java | 3 +- .../apache/phoenix/end2end/DynamicColumnIT.java | 2 - .../apache/phoenix/end2end/DynamicFamilyIT.java | 2 - .../apache/phoenix/end2end/DynamicUpsertIT.java | 3 +- .../phoenix/end2end/EvaluationOfORIT.java | 2 - .../phoenix/end2end/ExecuteStatementsIT.java| 3 +- .../phoenix/end2end/ExtendedQueryExecIT.java| 3 +- .../phoenix/end2end/FirstValueFunctionIT.java | 11 +- .../apache/phoenix/end2end/FunkyNamesIT.java| 3 +- .../apache/phoenix/end2end/GroupByCaseIT.java | 3 +- .../org/apache/phoenix/end2end/GroupByIT.java | 3 +- .../org/apache/phoenix/end2end/HashJoinIT.java | 3 +- .../org/apache/phoenix/end2end/InListIT.java| 4 +- .../phoenix/end2end/InMemoryOrderByIT.java | 3 +- .../org/apache/phoenix/end2end/IsNullIT.java| 3 +- .../org/apache/phoenix/end2end/KeyOnlyIT.java | 3 +- .../phoenix/end2end/LastValueFunctionIT.java| 3 +- .../apache/phoenix/end2end/LpadFunctionIT.java | 3 +- .../apache/phoenix/end2end/MD5FunctionIT.java | 3 +- .../phoenix/end2end/MappingTableDataTypeIT.java | 3 +- .../phoenix/end2end/ModulusExpressionIT.java| 5 +- .../phoenix/end2end/MultiCfQueryExecIT.java | 3 +- .../phoenix/end2end/NativeHBaseTypesIT.java | 3 +- .../org/apache/phoenix/end2end/NotQueryIT.java | 3 +- .../phoenix/end2end/NthValueFunctionIT.java | 3 +- .../org/apache/phoenix/end2end/OrderByIT.java | 3 +- .../phoenix/end2end/ParallelIteratorsIT.java| 3 +- .../apache/phoenix/end2end/PercentileIT.java| 3 +- .../phoenix/end2end/ProductMetricsIT.java | 3 +- .../end2end/QueryDatabaseMetaDataIT.java| 3 +- .../phoenix/end2end/QueryExecWithoutSCNIT.java | 3 +- .../org/apache/phoenix/end2end/QueryIT.java | 3 +- .../org/apache/phoenix/end2end/QueryMoreIT.java | 3 +- .../phoenix/end2end/QueryWithLimitIT.java | 3 +- .../phoenix/end2end/ReadIsolationLevelIT.java | 3 +- .../org/apache/phoenix/end2end/ReadOnlyIT.java | 3 +- .../phoenix/end2end/RegexpSplitFunctionIT.java | 3 +- .../phoenix/end2end/RegexpSubstrFunctionIT.java | 3 +- .../phoenix/end2end/ReverseFunctionIT.java | 3 +- .../apache/phoenix/end2end/ReverseScanIT.java | 3 +- .../RoundFloorCeilFunctionsEnd2EndIT.java | 3 +- .../phoenix/end2end/RowValueConstructorIT.java | 3 +- .../apache/phoenix/end2end/SaltedViewIT.java| 3 +- .../org/apache/phoenix/end2end/ScanQueryIT.java | 3 +- .../org/apache/phoenix/end2end/SequenceIT.java | 3 +- .../phoenix/end2end/ServerExceptionIT.java | 3 +- .../end2end/SkipScanAfterManualSplitIT.java | 3 +- .../apache/phoenix/end2end/SkipScanQueryIT.java | 3 +-
[1/2] phoenix git commit: PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain)
Repository: phoenix Updated Branches: refs/heads/3.0 c8b86f325 - 6db262b46 http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java index 7c6c342..4220108 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SubqueryIT.java @@ -56,14 +56,13 @@ import org.apache.phoenix.util.ReadOnlyProps; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.experimental.categories.Category; 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; -@Category(HBaseManagedTimeTest.class) + @RunWith(Parameterized.class) public class SubqueryIT extends BaseHBaseManagedTimeIT { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java index 42fe5b8..4d0b45d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDDLIT.java @@ -56,9 +56,8 @@ import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; import org.apache.phoenix.util.StringUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) + public class TenantSpecificTablesDDLIT extends BaseTenantSpecificTablesIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java index c098a76..dbdef59 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificTablesDMLIT.java @@ -37,9 +37,8 @@ import org.apache.phoenix.schema.TableNotFoundException; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.PropertiesUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(NeedsOwnMiniClusterTest.class) + public class TenantSpecificTablesDMLIT extends BaseTenantSpecificTablesIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java index 8abda3b..4fc4166 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexIT.java @@ -32,9 +32,8 @@ import org.apache.phoenix.schema.ColumnNotFoundException; import org.apache.phoenix.util.PhoenixRuntime; import org.apache.phoenix.util.QueryUtil; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) + public class TenantSpecificViewIndexIT extends BaseTenantSpecificViewIndexIT { @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/6db262b4/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java index 388aaef..2e6784f 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/TenantSpecificViewIndexSaltedIT.java @@ -22,9 +22,7 @@ package org.apache.phoenix.end2end; import org.junit.Test; -import org.junit.experimental.categories.Category; -@Category(HBaseManagedTimeTest.class) public class TenantSpecificViewIndexSaltedIT
[2/2] phoenix git commit: PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain)
PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6db262b4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6db262b4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6db262b4 Branch: refs/heads/3.0 Commit: 6db262b468109845fd9edf76ad371c3f45b3023d Parents: c8b86f3 Author: James Taylor jtay...@salesforce.com Authored: Tue Nov 25 14:22:45 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Tue Nov 25 14:22:45 2014 -0800 -- .../WALReplayWithIndexWritesAndCompressedWALIT.java | 14 -- .../java/org/apache/phoenix/end2end/AlterTableIT.java | 3 +-- .../org/apache/phoenix/end2end/ArithmeticQueryIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/ArrayIT.java | 2 -- .../java/org/apache/phoenix/end2end/AutoCommitIT.java | 3 +-- .../end2end/BaseOwnClusterClientManagedTimeIT.java| 3 +-- .../end2end/BaseOwnClusterHBaseManagedTimeIT.java | 3 +-- .../java/org/apache/phoenix/end2end/BaseQueryIT.java | 2 -- .../phoenix/end2end/BaseTenantSpecificTablesIT.java | 3 +-- .../end2end/BaseTenantSpecificViewIndexIT.java| 1 + .../java/org/apache/phoenix/end2end/BaseViewIT.java | 2 -- .../org/apache/phoenix/end2end/BinaryRowKeyIT.java| 3 +-- .../apache/phoenix/end2end/CSVCommonsLoaderIT.java| 3 +-- .../org/apache/phoenix/end2end/CaseStatementIT.java | 2 -- .../org/apache/phoenix/end2end/CastAndCoerceIT.java | 2 -- .../phoenix/end2end/ClientTimeArithmeticQueryIT.java | 3 +-- .../apache/phoenix/end2end/CoalesceFunctionIT.java| 3 +-- .../end2end/ColumnProjectionOptimizationIT.java | 2 -- .../phoenix/end2end/CompareDecimalToLongIT.java | 3 +-- .../phoenix/end2end/ConvertTimezoneFunctionIT.java| 3 +-- .../phoenix/end2end/CountDistinctCompressionIT.java | 3 +-- .../org/apache/phoenix/end2end/CreateTableIT.java | 3 +-- .../apache/phoenix/end2end/CustomEntityDataIT.java| 3 +-- .../org/apache/phoenix/end2end/DecodeFunctionIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/DeleteIT.java | 2 -- .../org/apache/phoenix/end2end/DerivedTableIT.java| 2 -- .../org/apache/phoenix/end2end/DistinctCountIT.java | 3 +-- .../org/apache/phoenix/end2end/DynamicColumnIT.java | 2 -- .../org/apache/phoenix/end2end/DynamicFamilyIT.java | 2 -- .../org/apache/phoenix/end2end/DynamicUpsertIT.java | 3 +-- .../org/apache/phoenix/end2end/EvaluationOfORIT.java | 2 -- .../apache/phoenix/end2end/ExecuteStatementsIT.java | 3 +-- .../apache/phoenix/end2end/ExtendedQueryExecIT.java | 3 +-- .../java/org/apache/phoenix/end2end/FunkyNamesIT.java | 3 +-- .../org/apache/phoenix/end2end/GroupByCaseIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/GroupByIT.java | 3 +-- .../java/org/apache/phoenix/end2end/HashJoinIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/InListIT.java | 4 +--- .../org/apache/phoenix/end2end/InMemoryOrderByIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/IsNullIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/KeyOnlyIT.java | 3 +-- .../apache/phoenix/end2end/LastValueFunctionIT.java | 3 +-- .../org/apache/phoenix/end2end/LpadFunctionIT.java| 3 +-- .../org/apache/phoenix/end2end/MD5FunctionIT.java | 3 +-- .../phoenix/end2end/MappingTableDataTypeIT.java | 3 +-- .../apache/phoenix/end2end/ModulusExpressionIT.java | 5 ++--- .../apache/phoenix/end2end/MultiCfQueryExecIT.java| 3 +-- .../apache/phoenix/end2end/NativeHBaseTypesIT.java| 3 +-- .../java/org/apache/phoenix/end2end/NotQueryIT.java | 3 +-- .../apache/phoenix/end2end/NthValueFunctionIT.java| 3 +-- .../it/java/org/apache/phoenix/end2end/OrderByIT.java | 2 -- .../apache/phoenix/end2end/ParallelIteratorsIT.java | 3 +-- .../java/org/apache/phoenix/end2end/PercentileIT.java | 3 +-- .../org/apache/phoenix/end2end/ProductMetricsIT.java | 3 +-- .../phoenix/end2end/QueryDatabaseMetaDataIT.java | 3 +-- .../apache/phoenix/end2end/QueryExecWithoutSCNIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/QueryIT.java | 3 +-- .../java/org/apache/phoenix/end2end/QueryMoreIT.java | 3 +-- .../org/apache/phoenix/end2end/QueryWithLimitIT.java | 3 +-- .../apache/phoenix/end2end/ReadIsolationLevelIT.java | 3 +-- .../java/org/apache/phoenix/end2end/ReadOnlyIT.java | 3 +-- .../apache/phoenix/end2end/RegexpSplitFunctionIT.java | 3 +-- .../phoenix/end2end/RegexpSubstrFunctionIT.java | 3 +-- .../org/apache/phoenix/end2end/ReverseFunctionIT.java | 3 +-- .../end2end/RoundFloorCeilFunctionsEnd2EndIT.java | 3 +-- .../apache/phoenix/end2end/RowValueConstructorIT.java | 3 +-- .../java/org/apache/phoenix/end2end/SaltedViewIT.java | 3 +--
Apache-Phoenix | Master | Build Successful
Master 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-master/lastSuccessfulBuild/artifact/ Last Complete Test Report https://builds.apache.org/job/Phoenix-master/lastCompletedBuild/testReport/ Changes [jtaylor] Revert Upgrade to 4.12 Junit and update tests by removing @Category (Samarth Jain) [jtaylor] PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain)
Apache-Phoenix | 4.0 | Build Successful
4.0 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git Compiled Artifacts https://builds.apache.org/job/Phoenix-4.0/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.0/lastCompletedBuild/testReport/ Changes [jtaylor] PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain)
[2/2] phoenix git commit: PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain)
PHOENIX-1467 Upgrade to 4.12 Junit and update tests by removing @Category annotation (Samarth Jain) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/35ce2ecc Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/35ce2ecc Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/35ce2ecc Branch: refs/heads/3.2 Commit: 35ce2ecc3f0ce7ad7171d9cc39c11299416efd97 Parents: a94e4a0 Author: James Taylor jtay...@salesforce.com Authored: Tue Nov 25 14:59:40 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Tue Nov 25 14:59:40 2014 -0800 -- .../WALReplayWithIndexWritesAndCompressedWALIT.java | 14 -- .../java/org/apache/phoenix/end2end/AlterTableIT.java | 3 +-- .../org/apache/phoenix/end2end/ArithmeticQueryIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/ArrayIT.java | 2 -- .../java/org/apache/phoenix/end2end/AutoCommitIT.java | 3 +-- .../end2end/BaseOwnClusterClientManagedTimeIT.java| 3 +-- .../end2end/BaseOwnClusterHBaseManagedTimeIT.java | 3 +-- .../java/org/apache/phoenix/end2end/BaseQueryIT.java | 2 -- .../phoenix/end2end/BaseTenantSpecificTablesIT.java | 3 +-- .../end2end/BaseTenantSpecificViewIndexIT.java| 1 + .../java/org/apache/phoenix/end2end/BaseViewIT.java | 2 -- .../org/apache/phoenix/end2end/BinaryRowKeyIT.java| 3 +-- .../apache/phoenix/end2end/CSVCommonsLoaderIT.java| 3 +-- .../org/apache/phoenix/end2end/CaseStatementIT.java | 2 -- .../org/apache/phoenix/end2end/CastAndCoerceIT.java | 2 -- .../phoenix/end2end/ClientTimeArithmeticQueryIT.java | 3 +-- .../apache/phoenix/end2end/CoalesceFunctionIT.java| 3 +-- .../end2end/ColumnProjectionOptimizationIT.java | 2 -- .../phoenix/end2end/CompareDecimalToLongIT.java | 3 +-- .../phoenix/end2end/ConvertTimezoneFunctionIT.java| 3 +-- .../phoenix/end2end/CountDistinctCompressionIT.java | 3 +-- .../org/apache/phoenix/end2end/CreateTableIT.java | 3 +-- .../apache/phoenix/end2end/CustomEntityDataIT.java| 3 +-- .../org/apache/phoenix/end2end/DecodeFunctionIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/DeleteIT.java | 2 -- .../org/apache/phoenix/end2end/DerivedTableIT.java| 2 -- .../org/apache/phoenix/end2end/DistinctCountIT.java | 3 +-- .../org/apache/phoenix/end2end/DynamicColumnIT.java | 2 -- .../org/apache/phoenix/end2end/DynamicFamilyIT.java | 2 -- .../org/apache/phoenix/end2end/DynamicUpsertIT.java | 3 +-- .../org/apache/phoenix/end2end/EvaluationOfORIT.java | 2 -- .../apache/phoenix/end2end/ExecuteStatementsIT.java | 3 +-- .../apache/phoenix/end2end/ExtendedQueryExecIT.java | 3 +-- .../java/org/apache/phoenix/end2end/FunkyNamesIT.java | 3 +-- .../org/apache/phoenix/end2end/GroupByCaseIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/GroupByIT.java | 3 +-- .../java/org/apache/phoenix/end2end/HashJoinIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/InListIT.java | 4 +--- .../org/apache/phoenix/end2end/InMemoryOrderByIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/IsNullIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/KeyOnlyIT.java | 3 +-- .../apache/phoenix/end2end/LastValueFunctionIT.java | 3 +-- .../org/apache/phoenix/end2end/LpadFunctionIT.java| 3 +-- .../org/apache/phoenix/end2end/MD5FunctionIT.java | 3 +-- .../phoenix/end2end/MappingTableDataTypeIT.java | 3 +-- .../apache/phoenix/end2end/ModulusExpressionIT.java | 5 ++--- .../apache/phoenix/end2end/MultiCfQueryExecIT.java| 3 +-- .../apache/phoenix/end2end/NativeHBaseTypesIT.java| 3 +-- .../java/org/apache/phoenix/end2end/NotQueryIT.java | 3 +-- .../apache/phoenix/end2end/NthValueFunctionIT.java| 3 +-- .../it/java/org/apache/phoenix/end2end/OrderByIT.java | 2 -- .../apache/phoenix/end2end/ParallelIteratorsIT.java | 3 +-- .../java/org/apache/phoenix/end2end/PercentileIT.java | 3 +-- .../org/apache/phoenix/end2end/ProductMetricsIT.java | 3 +-- .../phoenix/end2end/QueryDatabaseMetaDataIT.java | 3 +-- .../apache/phoenix/end2end/QueryExecWithoutSCNIT.java | 3 +-- .../it/java/org/apache/phoenix/end2end/QueryIT.java | 3 +-- .../java/org/apache/phoenix/end2end/QueryMoreIT.java | 3 +-- .../org/apache/phoenix/end2end/QueryWithLimitIT.java | 3 +-- .../apache/phoenix/end2end/ReadIsolationLevelIT.java | 3 +-- .../java/org/apache/phoenix/end2end/ReadOnlyIT.java | 3 +-- .../apache/phoenix/end2end/RegexpSplitFunctionIT.java | 3 +-- .../phoenix/end2end/RegexpSubstrFunctionIT.java | 3 +-- .../org/apache/phoenix/end2end/ReverseFunctionIT.java | 3 +-- .../end2end/RoundFloorCeilFunctionsEnd2EndIT.java | 3 +-- .../apache/phoenix/end2end/RowValueConstructorIT.java | 3 +-- .../java/org/apache/phoenix/end2end/SaltedViewIT.java | 3 +--
phoenix git commit: PHOENIX-1474 NPE when RVC between combined with key part comparison
Repository: phoenix Updated Branches: refs/heads/4.2 448fb3dd0 - 09211a050 PHOENIX-1474 NPE when RVC between combined with key part comparison Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/09211a05 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/09211a05 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/09211a05 Branch: refs/heads/4.2 Commit: 09211a050c5253b2232270c13881149135b564bc Parents: 448fb3d Author: maryannxue maryann...@apache.org Authored: Tue Nov 25 18:16:34 2014 -0500 Committer: maryannxue maryann...@apache.org Committed: Tue Nov 25 18:16:34 2014 -0500 -- .../phoenix/end2end/RowValueConstructorIT.java | 15 +++ .../org/apache/phoenix/compile/WhereOptimizer.java | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/09211a05/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java index be91eab..8d67fa4 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java @@ -1311,6 +1311,21 @@ public class RowValueConstructorIT extends BaseClientManagedTimeIT { assertEquals(helo3, rs.getString(1)); assertEquals(3, rs.getInt(2)); assertFalse(rs.next()); + +stmt = conn.prepareStatement(select pk2, pk3 from RVC1 WHERE tenantId = ? AND (tenantId, pk2, pk3) BETWEEN (?, ?, ?) AND (?, ?, ?) LIMIT 100); +stmt.setString(1, ABC); +stmt.setString(2, ABC); +stmt.setString(3, helo2); +stmt.setInt(4, 2); +stmt.setString(5, DEF); +stmt.setString(6, helo3); +stmt.setInt(7, 3); + +rs = stmt.executeQuery(); +assertTrue(rs.next()); +assertEquals(helo2, rs.getString(1)); +assertEquals(2, rs.getInt(2)); +assertFalse(rs.next()); } // query against tenant specific view. Salted base table. http://git-wip-us.apache.org/repos/asf/phoenix/blob/09211a05/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java index 6a46a7b..f70ba21 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereOptimizer.java @@ -643,7 +643,9 @@ public class WhereOptimizer { // with our minMaxRange, since it spans columns and this would mess up our skip scan. minMaxRange = minMaxRange.intersect(childSlot.getMinMaxRange()); for (KeySlot slot : childSlot) { - minMaxExtractNodes.addAll(slot.getKeyPart().getExtractNodes()); +if (slot != null) { + minMaxExtractNodes.addAll(slot.getKeyPart().getExtractNodes()); +} } } else { for (KeySlot slot : childSlot) {
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 [maryannxue] PHOENIX-1474 NPE when RVC between combined with key part comparison
Apache-Phoenix | 4.0 | Build Successful
4.0 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git Compiled Artifacts https://builds.apache.org/job/Phoenix-4.0/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.0/lastCompletedBuild/testReport/ Changes [maryannxue] PHOENIX-1474 NPE when RVC between combined with key part comparison
[1/2] phoenix git commit: PHOENIX-1473 Connecting with Phoenix client when Phoenix is not deployed on region server(s) takes down region server(s)
Repository: phoenix Updated Branches: refs/heads/4.0 ed4ad1355 - 9430273c2 PHOENIX-1473 Connecting with Phoenix client when Phoenix is not deployed on region server(s) takes down region server(s) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9430273c Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9430273c Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9430273c Branch: refs/heads/4.0 Commit: 9430273c2ad7eac5ffb82712c7d038cf911adb60 Parents: c1d6da3 Author: James Taylor jtay...@salesforce.com Authored: Tue Nov 25 18:49:52 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Tue Nov 25 19:38:55 2014 -0800 -- .../DistinctValueWithCountServerAggregator.java | 4 -- .../query/ConnectionQueryServicesImpl.java | 43 ++-- 2 files changed, 31 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/9430273c/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/DistinctValueWithCountServerAggregator.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/DistinctValueWithCountServerAggregator.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/DistinctValueWithCountServerAggregator.java index 70de959..3a1789b 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/DistinctValueWithCountServerAggregator.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/DistinctValueWithCountServerAggregator.java @@ -32,9 +32,6 @@ import org.apache.phoenix.schema.SortOrder; import org.apache.phoenix.schema.tuple.Tuple; import org.apache.phoenix.util.ByteUtil; import org.apache.phoenix.util.SizedUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.iq80.snappy.Snappy; /** @@ -44,7 +41,6 @@ import org.iq80.snappy.Snappy; * @since 1.2.1 */ public class DistinctValueWithCountServerAggregator extends BaseAggregator { -private static final Logger LOG = LoggerFactory.getLogger(DistinctValueWithCountServerAggregator.class); public static final int DEFAULT_ESTIMATED_DISTINCT_VALUES = 1; public static final byte[] COMPRESS_MARKER = new byte[] { (byte)1 }; http://git-wip-us.apache.org/repos/asf/phoenix/blob/9430273c/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java index 18f2f50..299b367 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java @@ -108,6 +108,7 @@ import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver.ConnectionInfo; import org.apache.phoenix.protobuf.ProtobufUtil; import org.apache.phoenix.schema.EmptySequenceCacheException; +import org.apache.phoenix.schema.MetaDataSplitPolicy; import org.apache.phoenix.schema.NewerTableAlreadyExistsException; import org.apache.phoenix.schema.PColumn; import org.apache.phoenix.schema.PColumnFamily; @@ -738,8 +739,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement } private void addOrModifyColumnDescriptor(byte[] tableName, HBaseAdmin admin, HColumnDescriptor oldColumnDesc, -HColumnDescriptor newColumnDesc) throws IOException, org.apache.hadoop.hbase.TableNotFoundException, -InterruptedException, TimeoutException { +HColumnDescriptor newColumnDesc) throws IOException, InterruptedException, TimeoutException { boolean isOnlineSchemaUpgradeEnabled = ConnectionQueryServicesImpl.this.props.getBoolean( QueryServices.ALLOW_ONLINE_TABLE_SCHEMA_UPDATE, QueryServicesOptions.DEFAULT_ALLOW_ONLINE_TABLE_SCHEMA_UPDATE); @@ -761,7 +761,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement } private static interface RetriableOperation { -boolean checkForCompletion() throws TimeoutException, org.apache.hadoop.hbase.TableNotFoundException, IOException; +boolean checkForCompletion() throws TimeoutException, IOException; String getOperatioName(); } @@ -775,8 +775,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement } @Override -public boolean checkForCompletion() throws TimeoutException, -
[1/2] phoenix git commit: PHOENIX-1408 Don't disable table before modifying HTable metadata (Samarth Jain)
Repository: phoenix Updated Branches: refs/heads/master 88196ca9f - 9c4d945e1 PHOENIX-1408 Don't disable table before modifying HTable metadata (Samarth Jain) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/152f98fe Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/152f98fe Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/152f98fe Branch: refs/heads/master Commit: 152f98fe71d494e9a80cb619dfd7170a85dc5ffe Parents: 88196ca Author: James Taylor jtay...@salesforce.com Authored: Tue Nov 25 17:34:45 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Tue Nov 25 19:40:20 2014 -0800 -- .../apache/phoenix/end2end/AlterTableIT.java| 19 +- .../query/ConnectionQueryServicesImpl.java | 190 --- .../org/apache/phoenix/query/QueryServices.java | 3 + .../phoenix/query/QueryServicesOptions.java | 28 ++- 4 files changed, 212 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/152f98fe/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java index f711bd4..2943fe6 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java @@ -911,4 +911,21 @@ public class AlterTableIT extends BaseHBaseManagedTimeIT { ddl = ALTER TABLE T ADD STRING_ARRAY1 VARCHAR[]; conn1.createStatement().execute(ddl); conn1.close(); -}} +} + +@Test +public void testAddColumnForNewColumnFamily() throws Exception { +Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); +String ddl = CREATE TABLE T (\n ++ID1 VARCHAR(15) NOT NULL,\n ++ID2 VARCHAR(15) NOT NULL,\n ++CREATED_DATE DATE,\n ++CREATION_TIME BIGINT,\n ++LAST_USED DATE,\n ++CONSTRAINT PK PRIMARY KEY (ID1, ID2)) SALT_BUCKETS = 8; +Connection conn1 = DriverManager.getConnection(getUrl(), props); +conn1.createStatement().execute(ddl); +ddl = ALTER TABLE T ADD CF.STRING VARCHAR; +conn1.createStatement().execute(ddl); +} +} http://git-wip-us.apache.org/repos/asf/phoenix/blob/152f98fe/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java index 7036909..a7444bb 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java @@ -34,6 +34,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import javax.annotation.concurrent.GuardedBy; @@ -141,6 +142,7 @@ import org.apache.phoenix.util.UpgradeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Stopwatch; import com.google.common.base.Throwables; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -476,6 +478,8 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement } latestMetaDataLock.wait(waitTime); } catch (InterruptedException e) { +// restore the interrupt status +Thread.currentThread().interrupt(); throw new SQLExceptionInfo.Builder(SQLExceptionCode.INTERRUPTED_EXCEPTION) .setRootCause(e).build().buildException(); // FIXME } @@ -675,11 +679,11 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement try { admin = new HBaseAdmin(config); try { -HTableDescriptor existingDesc = admin.getTableDescriptor(tableName); -HColumnDescriptor oldDescriptor = existingDesc.getFamily(family.getFirst()); -HColumnDescriptor columnDescriptor = null; +HTableDescriptor existingTableDesc = admin.getTableDescriptor(tableName); +HColumnDescriptor oldColumnDesc = existingTableDesc.getFamily(family.getFirst()); +
[2/2] phoenix git commit: PHOENIX-1473 Connecting with Phoenix client when Phoenix is not deployed on region server(s) takes down region server(s)
PHOENIX-1473 Connecting with Phoenix client when Phoenix is not deployed on region server(s) takes down region server(s) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9c4d945e Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9c4d945e Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9c4d945e Branch: refs/heads/master Commit: 9c4d945e1978f1638db8796ff11ab3a87cd85b1f Parents: 152f98f Author: James Taylor jtay...@salesforce.com Authored: Tue Nov 25 18:49:52 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Tue Nov 25 19:40:38 2014 -0800 -- .../query/ConnectionQueryServicesImpl.java | 43 ++-- 1 file changed, 31 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/9c4d945e/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java index a7444bb..c0a9eb5 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java @@ -108,6 +108,7 @@ import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver.ConnectionInfo; import org.apache.phoenix.protobuf.ProtobufUtil; import org.apache.phoenix.schema.EmptySequenceCacheException; +import org.apache.phoenix.schema.MetaDataSplitPolicy; import org.apache.phoenix.schema.NewerTableAlreadyExistsException; import org.apache.phoenix.schema.PColumn; import org.apache.phoenix.schema.PColumnFamily; @@ -738,8 +739,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement } private void addOrModifyColumnDescriptor(byte[] tableName, HBaseAdmin admin, HColumnDescriptor oldColumnDesc, -HColumnDescriptor newColumnDesc) throws IOException, org.apache.hadoop.hbase.TableNotFoundException, -InterruptedException, TimeoutException { +HColumnDescriptor newColumnDesc) throws IOException, InterruptedException, TimeoutException { boolean isOnlineSchemaUpgradeEnabled = ConnectionQueryServicesImpl.this.props.getBoolean( QueryServices.ALLOW_ONLINE_TABLE_SCHEMA_UPDATE, QueryServicesOptions.DEFAULT_ALLOW_ONLINE_TABLE_SCHEMA_UPDATE); @@ -761,7 +761,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement } private static interface RetriableOperation { -boolean checkForCompletion() throws TimeoutException, org.apache.hadoop.hbase.TableNotFoundException, IOException; +boolean checkForCompletion() throws TimeoutException, IOException; String getOperatioName(); } @@ -775,8 +775,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement } @Override -public boolean checkForCompletion() throws TimeoutException, -org.apache.hadoop.hbase.TableNotFoundException, IOException { +public boolean checkForCompletion() throws TimeoutException, IOException { HTableDescriptor tableDesc = admin.getTableDescriptor(tableName); return newTableDescriptor.equals(tableDesc); } @@ -793,8 +792,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement } @Override -public boolean checkForCompletion() throws TimeoutException, -org.apache.hadoop.hbase.TableNotFoundException, IOException { +public boolean checkForCompletion() throws TimeoutException, IOException { HTableDescriptor newTableDesc = admin.getTableDescriptor(tableName); return newTableDesc.getFamilies().contains(columnFamilyDesc); } @@ -847,6 +845,12 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement } } } + +private boolean allowOnlineTableSchemaUpdate() { +return props.getBoolean( +QueryServices.ALLOW_ONLINE_TABLE_SCHEMA_UPDATE, + QueryServicesOptions.DEFAULT_ALLOW_ONLINE_TABLE_SCHEMA_UPDATE); +} /** * @@ -885,6 +889,10 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement if (newDesc.getValue(MetaDataUtil.IS_LOCAL_INDEX_TABLE_PROP_BYTES) != null
Apache-Phoenix | Master | Build Successful
Master 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-master/lastSuccessfulBuild/artifact/ Last Complete Test Report https://builds.apache.org/job/Phoenix-master/lastCompletedBuild/testReport/ Changes [jtaylor] PHOENIX-1408 Don't disable table before modifying HTable metadata (Samarth Jain) [jtaylor] PHOENIX-1473 Connecting with Phoenix client when Phoenix is not deployed on region server(s) takes down region server(s)
phoenix git commit: PHOENIX-1408 Don't disable table before modifying HTable metadata
Repository: phoenix Updated Branches: refs/heads/4.0 9430273c2 - a3850e7fc PHOENIX-1408 Don't disable table before modifying HTable metadata Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a3850e7f Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a3850e7f Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a3850e7f Branch: refs/heads/4.0 Commit: a3850e7fcfa4642d6d54ddaa42c244971c9699ff Parents: 9430273 Author: James Taylor jtay...@salesforce.com Authored: Tue Nov 25 22:04:11 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Tue Nov 25 22:04:11 2014 -0800 -- .../main/java/org/apache/phoenix/query/QueryServicesOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a3850e7f/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 7cfa3aa..8088e2d 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 @@ -488,7 +488,7 @@ public class QueryServicesOptions { } public QueryServicesOptions setDelayInMillisForSchemaChangeCheck(long delayInMillis) { -config.setLong(NUM_RETRIES_FOR_SCHEMA_UPDATE_CHECK, delayInMillis); +config.setLong(DELAY_FOR_SCHEMA_UPDATE_CHECK, delayInMillis); return this; }
Build failed in Jenkins: Phoenix | 4.0 #473
See https://builds.apache.org/job/Phoenix-4.0/473/changes Changes: [jtaylor] PHOENIX-1408 Don't disable table before modifying HTable metadata -- [...truncated 540 lines...] Running org.apache.phoenix.end2end.RowValueConstructorIT Tests run: 48, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.45 sec - in org.apache.phoenix.end2end.ArrayIT Running org.apache.phoenix.end2end.NotQueryIT Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 36.514 sec - in org.apache.phoenix.end2end.RowValueConstructorIT Running org.apache.phoenix.end2end.IsNullIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.879 sec - in org.apache.phoenix.end2end.IsNullIT Running org.apache.phoenix.end2end.PercentileIT Tests run: 17, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.425 sec - in org.apache.phoenix.end2end.PercentileIT Running org.apache.phoenix.end2end.DistinctCountIT Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.26 sec - in org.apache.phoenix.end2end.DistinctCountIT Running org.apache.phoenix.end2end.InMemoryOrderByIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.851 sec - in org.apache.phoenix.end2end.InMemoryOrderByIT Tests run: 119, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 95.05 sec - in org.apache.phoenix.end2end.ScanQueryIT Tests run: 77, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 68.779 sec - in org.apache.phoenix.end2end.NotQueryIT Tests run: 210, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 168.602 sec - in org.apache.phoenix.end2end.ClientTimeArithmeticQueryIT Tests run: 182, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 197.366 sec - in org.apache.phoenix.end2end.QueryIT Results : Tests run: 976, Failures: 0, Errors: 0, Skipped: 0 [INFO] [failsafe:integration-test {execution: HBaseManagedTimeTests}] [INFO] Failsafe report directory: https://builds.apache.org/job/Phoenix-4.0/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 --- Running org.apache.phoenix.end2end.EncodeFunctionIT Running org.apache.phoenix.trace.PhoenixTableMetricsWriterIT Running org.apache.phoenix.trace.PhoenixTracingEndToEndIT Running org.apache.phoenix.end2end.MappingTableDataTypeIT Running org.apache.phoenix.trace.PhoenixTraceReaderIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.713 sec - in org.apache.phoenix.trace.PhoenixTableMetricsWriterIT Running org.apache.phoenix.end2end.SpooledSortMergeJoinIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.666 sec - in org.apache.phoenix.trace.PhoenixTraceReaderIT Running org.apache.phoenix.end2end.CSVCommonsLoaderIT Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.382 sec - in org.apache.phoenix.end2end.EncodeFunctionIT Running org.apache.phoenix.end2end.SpooledTmpFileDeleteIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.503 sec - in org.apache.phoenix.end2end.MappingTableDataTypeIT Running org.apache.phoenix.end2end.SkipScanAfterManualSplitIT Tests run: 1, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 3.239 sec FAILURE! - in org.apache.phoenix.end2end.SpooledTmpFileDeleteIT testDeleteAllSpooledTmpFiles(org.apache.phoenix.end2end.SpooledTmpFileDeleteIT) Time elapsed: 1.794 sec FAILURE! java.lang.AssertionError: null at org.junit.Assert.fail(Assert.java:86) at org.junit.Assert.assertTrue(Assert.java:41) at org.junit.Assert.assertTrue(Assert.java:52) at org.apache.phoenix.end2end.SpooledTmpFileDeleteIT.testDeleteAllSpooledTmpFiles(SpooledTmpFileDeleteIT.java:121) Running org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.163 sec - in org.apache.phoenix.end2end.CSVCommonsLoaderIT Running org.apache.phoenix.end2end.EvaluationOfORIT Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.637 sec - in org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT Running org.apache.phoenix.end2end.index.SaltedIndexIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.338 sec - in org.apache.phoenix.end2end.EvaluationOfORIT Running org.apache.phoenix.end2end.index.DropViewIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.261 sec - in org.apache.phoenix.end2end.index.DropViewIT Running org.apache.phoenix.end2end.index.ViewIndexIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.567 sec - in org.apache.phoenix.end2end.index.ViewIndexIT Running org.apache.phoenix.end2end.index.LocalIndexIT Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.331 sec - in