git commit: PHOENIX-1174 Rename and move properties using existing convention

2014-08-17 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.0 db3b65669 - 2ecc9599b


PHOENIX-1174 Rename and move properties using existing convention


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

Branch: refs/heads/4.0
Commit: 2ecc9599bfcf85a5fbf87235b366042932cf13ff
Parents: db3b656
Author: James Taylor jtay...@salesforce.com
Authored: Sun Aug 17 00:35:53 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sun Aug 17 00:35:53 2014 -0700

--
 .../phoenix/trace/PhoenixTableMetricsWriterIT.java   |  5 +++--
 .../phoenix/trace/PhoenixTracingEndToEndIT.java  |  3 ++-
 .../java/org/apache/phoenix/query/QueryServices.java | 15 ---
 .../apache/phoenix/query/QueryServicesOptions.java   |  6 ++
 .../phoenix/trace/PhoenixTableMetricsWriter.java | 10 ++
 .../java/org/apache/phoenix/trace/TraceReader.java   | 13 ++---
 .../java/org/apache/phoenix/trace/util/Tracing.java  |  2 +-
 .../java/org/apache/phoenix/trace/TracingCompat.java |  8 
 8 files changed, 32 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2ecc9599/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTableMetricsWriterIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTableMetricsWriterIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTableMetricsWriterIT.java
index b1544e8..ecac21b 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTableMetricsWriterIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTableMetricsWriterIT.java
@@ -24,6 +24,7 @@ import java.sql.Connection;
 import java.util.Collection;
 
 import org.apache.phoenix.metrics.PhoenixMetricsRecord;
+import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.trace.Hadoop1TracingTestEnabler.Hadoop1Disabled;
 import org.apache.phoenix.trace.TraceReader.SpanInfo;
 import org.apache.phoenix.trace.TraceReader.TraceHolder;
@@ -50,9 +51,9 @@ public class PhoenixTableMetricsWriterIT extends 
BaseTracingTestIT {
 
 // check for existence of the tracing table
 try {
-String ddl = CREATE TABLE  + 
TracingCompat.DEFAULT_STATS_TABLE_NAME;
+String ddl = CREATE TABLE  + 
QueryServicesOptions.DEFAULT_TRACING_STATS_TABLE_NAME;
 conn.createStatement().execute(ddl);
-fail(Table  + TracingCompat.DEFAULT_STATS_TABLE_NAME
+fail(Table  + 
QueryServicesOptions.DEFAULT_TRACING_STATS_TABLE_NAME
 +  was not created by the metrics sink);
 } catch (Exception e) {
 // expected

http://git-wip-us.apache.org/repos/asf/phoenix/blob/2ecc9599/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
index 0fe4538..6742f9e 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/trace/PhoenixTracingEndToEndIT.java
@@ -34,6 +34,7 @@ import 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
 import org.apache.phoenix.end2end.HBaseManagedTimeTest;
 import org.apache.phoenix.metrics.Metrics;
 import org.apache.phoenix.metrics.TracingTestCompat;
+import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.trace.Hadoop1TracingTestEnabler.Hadoop1Disabled;
 import org.apache.phoenix.trace.TraceReader.SpanInfo;
 import org.apache.phoenix.trace.TraceReader.TraceHolder;
@@ -223,7 +224,7 @@ public class PhoenixTracingEndToEndIT extends 
BaseTracingTestIT {
 public boolean foundTrace(TraceHolder trace, SpanInfo span) {
 String traceInfo = trace.toString();
 // skip logging traces that are just traces about tracing
-if 
(traceInfo.contains(TracingCompat.DEFAULT_STATS_TABLE_NAME)) {
+if 
(traceInfo.contains(QueryServicesOptions.DEFAULT_TRACING_STATS_TABLE_NAME)) {
 return false;
 }
 if (traceInfo.contains(Completing index)) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/2ecc9599/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
--
diff --git

git commit: PHOENIX-1174 Rename and move properties using existing convention

2014-08-15 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.0 2a3a253c2 - 5aa381516


PHOENIX-1174 Rename and move properties using existing convention


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

Branch: refs/heads/4.0
Commit: 5aa38151681b0c9f7f15c7e520f1d1eea4821565
Parents: 2a3a253
Author: James Taylor jamestay...@apache.org
Authored: Fri Aug 15 14:32:14 2014 -0700
Committer: James Taylor jamestay...@apache.org
Committed: Fri Aug 15 14:32:14 2014 -0700

--
 .../phoenix/end2end/index/IndexHandlerIT.java   |  4 ++--
 .../ipc/PhoenixIndexRpcSchedulerFactory.java| 23 +---
 .../org/apache/phoenix/query/QueryServices.java |  9 
 .../phoenix/query/QueryServicesOptions.java | 11 --
 .../org/apache/phoenix/trace/util/Tracing.java  | 18 ++-
 .../PhoenixIndexRpcSchedulerFactoryTest.java|  5 +++--
 6 files changed, 35 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5aa38151/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexHandlerIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexHandlerIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexHandlerIT.java
index 8536652..1507d6b 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexHandlerIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexHandlerIT.java
@@ -38,7 +38,7 @@ import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.hbase.index.IndexQosRpcControllerFactory;
 import org.apache.phoenix.hbase.index.TableName;
-import org.apache.phoenix.hbase.index.ipc.PhoenixIndexRpcSchedulerFactory;
+import org.apache.phoenix.query.QueryServicesOptions;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -159,7 +159,7 @@ public class IndexHandlerIT {
 // check the counts on the rpc controller
 assertEquals(Didn't get the expected number of index priority 
writes!, 1,
 (int) CountingIndexClientRpcController.priorityCounts
-
.get(PhoenixIndexRpcSchedulerFactory.DEFAULT_INDEX_MIN_PRIORITY));
+.get(QueryServicesOptions.DEFAULT_INDEX_MIN_PRIORITY));
 
 table.close();
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5aa38151/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/ipc/PhoenixIndexRpcSchedulerFactory.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/ipc/PhoenixIndexRpcSchedulerFactory.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/ipc/PhoenixIndexRpcSchedulerFactory.java
index 500db7c..8e0b86f 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/ipc/PhoenixIndexRpcSchedulerFactory.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/ipc/PhoenixIndexRpcSchedulerFactory.java
@@ -26,6 +26,8 @@ import org.apache.hadoop.hbase.ipc.RpcScheduler;
 import org.apache.hadoop.hbase.regionserver.RegionServerServices;
 import org.apache.hadoop.hbase.regionserver.RpcSchedulerFactory;
 import org.apache.hadoop.hbase.regionserver.SimpleRpcSchedulerFactory;
+import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.query.QueryServicesOptions;
 
 import com.google.common.base.Preconditions;
 
@@ -37,21 +39,6 @@ public class PhoenixIndexRpcSchedulerFactory implements 
RpcSchedulerFactory {
 
 private static final Log LOG = 
LogFactory.getLog(PhoenixIndexRpcSchedulerFactory.class);
 
-private static final String INDEX_HANDLER_COUNT_KEY =
-org.apache.phoenix.regionserver.index.handler.count;
-private static final int DEFAULT_INDEX_HANDLER_COUNT = 30;
-
-/**
- * HConstants#HIGH_QOS is the max we will see to a standard table. We go 
higher to differentiate
- * and give some room for things in the middle
- */
-public static final int DEFAULT_INDEX_MIN_PRIORITY = 1000;
-public static final int DEFAULT_INDEX_MAX_PRIORITY = 1050;
-public static final String MIN_INDEX_PRIOIRTY_KEY =
-org.apache.phoenix.regionserver.index.priority.min;
-public static final String MAX_INDEX_PRIOIRTY_KEY =
-org.apache.phoenix.regionserver.index.priority.max;
-
 private static final String VERSION_TOO_OLD_FOR_INDEX_RPC =
 Running an older version of HBase (less than 0.98.4), Phoenix 
index RPC handling cannot be enabled.;
 
@@ -75,9 +62,9

git commit: PHOENIX-1174 Rename and move properties using existing convention

2014-08-15 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master dfcde1046 - 367662dc8


PHOENIX-1174 Rename and move properties using existing convention


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

Branch: refs/heads/master
Commit: 367662dc884433cd3e626b65e4417716966062fb
Parents: dfcde10
Author: James Taylor jamestay...@apache.org
Authored: Fri Aug 15 14:32:14 2014 -0700
Committer: James Taylor jamestay...@apache.org
Committed: Fri Aug 15 14:36:49 2014 -0700

--
 .../phoenix/end2end/index/IndexHandlerIT.java   |  4 ++--
 .../ipc/PhoenixIndexRpcSchedulerFactory.java| 23 +---
 .../org/apache/phoenix/query/QueryServices.java |  9 
 .../phoenix/query/QueryServicesOptions.java | 11 --
 .../org/apache/phoenix/trace/util/Tracing.java  | 18 ++-
 .../PhoenixIndexRpcSchedulerFactoryTest.java|  5 +++--
 6 files changed, 35 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/367662dc/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexHandlerIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexHandlerIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexHandlerIT.java
index 8536652..1507d6b 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexHandlerIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexHandlerIT.java
@@ -38,7 +38,7 @@ import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.hbase.index.IndexQosRpcControllerFactory;
 import org.apache.phoenix.hbase.index.TableName;
-import org.apache.phoenix.hbase.index.ipc.PhoenixIndexRpcSchedulerFactory;
+import org.apache.phoenix.query.QueryServicesOptions;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -159,7 +159,7 @@ public class IndexHandlerIT {
 // check the counts on the rpc controller
 assertEquals(Didn't get the expected number of index priority 
writes!, 1,
 (int) CountingIndexClientRpcController.priorityCounts
-
.get(PhoenixIndexRpcSchedulerFactory.DEFAULT_INDEX_MIN_PRIORITY));
+.get(QueryServicesOptions.DEFAULT_INDEX_MIN_PRIORITY));
 
 table.close();
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/367662dc/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/ipc/PhoenixIndexRpcSchedulerFactory.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/ipc/PhoenixIndexRpcSchedulerFactory.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/ipc/PhoenixIndexRpcSchedulerFactory.java
index 500db7c..8e0b86f 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/ipc/PhoenixIndexRpcSchedulerFactory.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/ipc/PhoenixIndexRpcSchedulerFactory.java
@@ -26,6 +26,8 @@ import org.apache.hadoop.hbase.ipc.RpcScheduler;
 import org.apache.hadoop.hbase.regionserver.RegionServerServices;
 import org.apache.hadoop.hbase.regionserver.RpcSchedulerFactory;
 import org.apache.hadoop.hbase.regionserver.SimpleRpcSchedulerFactory;
+import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.query.QueryServicesOptions;
 
 import com.google.common.base.Preconditions;
 
@@ -37,21 +39,6 @@ public class PhoenixIndexRpcSchedulerFactory implements 
RpcSchedulerFactory {
 
 private static final Log LOG = 
LogFactory.getLog(PhoenixIndexRpcSchedulerFactory.class);
 
-private static final String INDEX_HANDLER_COUNT_KEY =
-org.apache.phoenix.regionserver.index.handler.count;
-private static final int DEFAULT_INDEX_HANDLER_COUNT = 30;
-
-/**
- * HConstants#HIGH_QOS is the max we will see to a standard table. We go 
higher to differentiate
- * and give some room for things in the middle
- */
-public static final int DEFAULT_INDEX_MIN_PRIORITY = 1000;
-public static final int DEFAULT_INDEX_MAX_PRIORITY = 1050;
-public static final String MIN_INDEX_PRIOIRTY_KEY =
-org.apache.phoenix.regionserver.index.priority.min;
-public static final String MAX_INDEX_PRIOIRTY_KEY =
-org.apache.phoenix.regionserver.index.priority.max;
-
 private static final String VERSION_TOO_OLD_FOR_INDEX_RPC =
 Running an older version of HBase (less than 0.98.4), Phoenix 
index RPC handling cannot be enabled.;
 
@@ -75,9