[1/4] git commit: PHOENIX-1321 Cleanup setting of timestamps when collecting and using stats

2014-10-07 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/3.0 4b0d3ba19 -> 475a220f8


PHOENIX-1321 Cleanup setting of timestamps when collecting and using stats

Conflicts:

phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java

phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java

phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java

phoenix-core/src/main/java/org/apache/phoenix/schema/stat/StatisticsCollector.java

phoenix-core/src/main/java/org/apache/phoenix/schema/stat/StatisticsScanner.java

phoenix-core/src/main/java/org/apache/phoenix/schema/stat/StatisticsTable.java

phoenix-core/src/main/java/org/apache/phoenix/schema/stat/StatisticsUtils.java
phoenix-core/src/main/java/org/apache/phoenix/util/MetaDataUtil.java
phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java

phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java


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

Branch: refs/heads/3.0
Commit: 12fa6f7004fe70a657ebaea3d745296611b2b80e
Parents: 5effbbc
Author: James Taylor 
Authored: Mon Oct 6 16:02:37 2014 -0700
Committer: James Taylor 
Committed: Mon Oct 6 17:31:25 2014 -0700

--
 .../end2end/BaseTenantSpecificTablesIT.java |   2 +-
 .../org/apache/phoenix/end2end/KeyOnlyIT.java   |  33 +++--
 .../phoenix/end2end/MultiCfQueryExecIT.java |  27 ++--
 .../phoenix/end2end/ParallelIteratorsIT.java|   2 +-
 .../phoenix/end2end/StatsCollectorIT.java   |   2 +-
 .../phoenix/end2end/index/SaltedIndexIT.java|   2 +-
 .../phoenix/mapreduce/CsvBulkLoadToolIT.java|  21 +++-
 .../phoenix/compile/ExpressionCompiler.java |   8 +-
 .../coprocessor/MetaDataEndpointImpl.java   | 125 ++-
 .../UngroupedAggregateRegionObserver.java   |  15 ++-
 .../org/apache/phoenix/query/QueryServices.java |   9 +-
 .../phoenix/query/QueryServicesOptions.java |  31 ++---
 .../apache/phoenix/schema/MetaDataClient.java   |   2 +-
 .../schema/stat/StatisticsCollector.java|  27 ++--
 .../phoenix/schema/stat/StatisticsScanner.java  |  10 +-
 .../phoenix/schema/stat/StatisticsTable.java|  93 +++---
 .../phoenix/schema/stat/StatisticsUtils.java| 125 ++-
 .../org/apache/phoenix/util/MetaDataUtil.java   |  12 ++
 .../phoenix/query/QueryServicesTestImpl.java|   9 +-
 .../java/org/apache/phoenix/util/TestUtil.java  |  13 ++
 20 files changed, 296 insertions(+), 272 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/12fa6f70/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
index bcae7ed..b8fa035 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
@@ -84,7 +84,7 @@ public abstract class BaseTenantSpecificTablesIT extends 
BaseClientManagedTimeIT
 public static void doSetup() throws Exception {
 Map props = Maps.newHashMapWithExpectedSize(3);
 // Must update config before starting server
-props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB, 
Long.toString(20l));
+props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, 
Long.toString(20l));
 setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
 PHOENIX_JDBC_TENANT_SPECIFIC_URL = getUrl() + ';' + TENANT_ID_ATTRIB + 
'=' + TENANT_ID;
 PHOENIX_JDBC_TENANT_SPECIFIC_URL2 = getUrl() + ';' + TENANT_ID_ATTRIB 
+ '=' + TENANT_ID2;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/12fa6f70/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
index 4dee5d8..9b26c2e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
@@ -52,7 +52,7 @@ public class KeyOnlyIT extends BaseClientManagedTimeIT {
 public static void doSetup() throws

git commit: PHOENIX-1321 Cleanup setting of timestamps when collecting and using stats

2014-10-06 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master 3b30690f6 -> 7dbd3503b


PHOENIX-1321 Cleanup setting of timestamps when collecting and using stats


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

Branch: refs/heads/master
Commit: 7dbd3503bf19f1dc9ae3adb573c40fc72803295d
Parents: 3b30690
Author: James Taylor 
Authored: Mon Oct 6 16:02:37 2014 -0700
Committer: James Taylor 
Committed: Mon Oct 6 16:04:49 2014 -0700

--
 .../end2end/BaseTenantSpecificTablesIT.java |   2 +-
 .../org/apache/phoenix/end2end/KeyOnlyIT.java   |  33 --
 .../phoenix/end2end/MultiCfQueryExecIT.java |  27 +++--
 .../phoenix/end2end/ParallelIteratorsIT.java|   2 +-
 .../phoenix/end2end/StatsCollectorIT.java   |   2 +-
 .../phoenix/end2end/index/SaltedIndexIT.java|   2 +-
 .../phoenix/mapreduce/CsvBulkLoadToolIT.java|  22 +++-
 .../coprocessor/MetaDataEndpointImpl.java   | 105 +++--
 .../UngroupedAggregateRegionObserver.java   |  16 ++-
 .../org/apache/phoenix/query/QueryServices.java |   8 +-
 .../phoenix/query/QueryServicesOptions.java |  28 +++--
 .../apache/phoenix/schema/MetaDataClient.java   |   2 +-
 .../schema/stat/StatisticsCollector.java|  27 +++--
 .../phoenix/schema/stat/StatisticsScanner.java  |   8 +-
 .../phoenix/schema/stat/StatisticsTable.java|  90 +++
 .../phoenix/schema/stat/StatisticsUtils.java| 115 ++-
 .../org/apache/phoenix/util/MetaDataUtil.java   |  12 ++
 .../java/org/apache/phoenix/query/BaseTest.java |   2 +-
 .../phoenix/query/QueryServicesTestImpl.java|   8 +-
 .../java/org/apache/phoenix/util/TestUtil.java  |  13 +++
 20 files changed, 285 insertions(+), 239 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7dbd3503/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
index bcae7ed..b8fa035 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
@@ -84,7 +84,7 @@ public abstract class BaseTenantSpecificTablesIT extends 
BaseClientManagedTimeIT
 public static void doSetup() throws Exception {
 Map props = Maps.newHashMapWithExpectedSize(3);
 // Must update config before starting server
-props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB, 
Long.toString(20l));
+props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, 
Long.toString(20l));
 setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
 PHOENIX_JDBC_TENANT_SPECIFIC_URL = getUrl() + ';' + TENANT_ID_ATTRIB + 
'=' + TENANT_ID;
 PHOENIX_JDBC_TENANT_SPECIFIC_URL2 = getUrl() + ';' + TENANT_ID_ATTRIB 
+ '=' + TENANT_ID2;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/7dbd3503/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
index 4dee5d8..9b26c2e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
@@ -52,7 +52,7 @@ public class KeyOnlyIT extends BaseClientManagedTimeIT {
 public static void doSetup() throws Exception {
 Map props = Maps.newHashMapWithExpectedSize(3);
 // Must update config before starting server
-props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB, 
Long.toString(20l));
+props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, 
Long.toString(20));
 setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
 }
 @Test
@@ -60,11 +60,14 @@ public class KeyOnlyIT extends BaseClientManagedTimeIT {
 long ts = nextTimestamp();
 ensureTableCreated(getUrl(),KEYONLY_NAME,null, ts);
 initTableValues(ts+1);
-Properties props = new Properties();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts+30));
+Connection conn3 = DriverManager.getConnection(getUrl(), props);
+analyzeTable(conn3, KEYONLY_NAME);
+conn3.close();
 
-props

git commit: PHOENIX-1321 Cleanup setting of timestamps when collecting and using stats

2014-10-06 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.0 763f10f00 -> 5668817de


PHOENIX-1321 Cleanup setting of timestamps when collecting and using stats


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

Branch: refs/heads/4.0
Commit: 5668817dea05ea105f26648176be3f124a4157f2
Parents: 763f10f
Author: James Taylor 
Authored: Mon Oct 6 16:02:37 2014 -0700
Committer: James Taylor 
Committed: Mon Oct 6 16:02:37 2014 -0700

--
 .../end2end/BaseTenantSpecificTablesIT.java |   2 +-
 .../org/apache/phoenix/end2end/KeyOnlyIT.java   |  33 --
 .../phoenix/end2end/MultiCfQueryExecIT.java |  27 +++--
 .../phoenix/end2end/ParallelIteratorsIT.java|   2 +-
 .../phoenix/end2end/StatsCollectorIT.java   |   2 +-
 .../phoenix/end2end/index/SaltedIndexIT.java|   2 +-
 .../phoenix/mapreduce/CsvBulkLoadToolIT.java|  22 +++-
 .../coprocessor/MetaDataEndpointImpl.java   | 105 +++--
 .../UngroupedAggregateRegionObserver.java   |  16 ++-
 .../org/apache/phoenix/query/QueryServices.java |   8 +-
 .../phoenix/query/QueryServicesOptions.java |  28 +++--
 .../apache/phoenix/schema/MetaDataClient.java   |   2 +-
 .../schema/stat/StatisticsCollector.java|  27 +++--
 .../phoenix/schema/stat/StatisticsScanner.java  |   8 +-
 .../phoenix/schema/stat/StatisticsTable.java|  90 +++
 .../phoenix/schema/stat/StatisticsUtils.java| 115 ++-
 .../org/apache/phoenix/util/MetaDataUtil.java   |  12 ++
 .../java/org/apache/phoenix/query/BaseTest.java |   2 +-
 .../phoenix/query/QueryServicesTestImpl.java|   8 +-
 .../java/org/apache/phoenix/util/TestUtil.java  |  13 +++
 20 files changed, 285 insertions(+), 239 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5668817d/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
index bcae7ed..b8fa035 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseTenantSpecificTablesIT.java
@@ -84,7 +84,7 @@ public abstract class BaseTenantSpecificTablesIT extends 
BaseClientManagedTimeIT
 public static void doSetup() throws Exception {
 Map props = Maps.newHashMapWithExpectedSize(3);
 // Must update config before starting server
-props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB, 
Long.toString(20l));
+props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, 
Long.toString(20l));
 setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
 PHOENIX_JDBC_TENANT_SPECIFIC_URL = getUrl() + ';' + TENANT_ID_ATTRIB + 
'=' + TENANT_ID;
 PHOENIX_JDBC_TENANT_SPECIFIC_URL2 = getUrl() + ';' + TENANT_ID_ATTRIB 
+ '=' + TENANT_ID2;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5668817d/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
index 4dee5d8..9b26c2e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/KeyOnlyIT.java
@@ -52,7 +52,7 @@ public class KeyOnlyIT extends BaseClientManagedTimeIT {
 public static void doSetup() throws Exception {
 Map props = Maps.newHashMapWithExpectedSize(3);
 // Must update config before starting server
-props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB, 
Long.toString(20l));
+props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, 
Long.toString(20));
 setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
 }
 @Test
@@ -60,11 +60,14 @@ public class KeyOnlyIT extends BaseClientManagedTimeIT {
 long ts = nextTimestamp();
 ensureTableCreated(getUrl(),KEYONLY_NAME,null, ts);
 initTableValues(ts+1);
-Properties props = new Properties();
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts+30));
+Connection conn3 = DriverManager.getConnection(getUrl(), props);
+analyzeTable(conn3, KEYONLY_NAME);
+conn3.close();
 
-props.setPr