git commit: PHOENIX-1211 Use skip scan when row value constructor uses leading row key columns (Kyle Buzsaki)

2014-09-12 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.0 7cdc43770 - 3ebcbd76c


PHOENIX-1211 Use skip scan when row value constructor uses leading row key 
columns (Kyle Buzsaki)


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

Branch: refs/heads/4.0
Commit: 3ebcbd76cb5b83111f56372de1900c19a7c9e220
Parents: 7cdc437
Author: James Taylor jamestay...@apache.org
Authored: Fri Sep 12 17:21:14 2014 -0700
Committer: James Taylor jamestay...@apache.org
Committed: Fri Sep 12 17:21:14 2014 -0700

--
 .../org/apache/phoenix/end2end/InListIT.java| 24 +---
 .../phoenix/end2end/RowValueConstructorIT.java  | 53 +
 .../org/apache/phoenix/compile/ScanRanges.java  |  6 +-
 .../apache/phoenix/compile/WhereCompiler.java   |  4 +-
 .../apache/phoenix/compile/WhereOptimizer.java  |  6 --
 .../apache/phoenix/filter/SkipScanFilter.java   | 55 +++--
 .../org/apache/phoenix/schema/RowKeySchema.java | 62 ++--
 .../java/org/apache/phoenix/util/ScanUtil.java  | 39 +---
 .../phoenix/compile/WhereOptimizerTest.java |  4 +-
 9 files changed, 202 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3ebcbd76/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
index 524d494..dc60b69 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
@@ -164,6 +164,11 @@ public class InListIT extends BaseHBaseManagedTimeIT {
 private static final ListBoolean TENANCIES = Arrays.asList(false, true);
 private static final ListPDataType INTEGER_TYPES = 
Arrays.asList(PDataType.INTEGER, PDataType.LONG);
 private static final ListInteger SALT_BUCKET_NUMBERS = Arrays.asList(0, 
4);
+
+// we should be including the RANGE_SCAN hint here, but a bug with 
ParallelIterators causes tests to fail
+// see the relevant JIRA here: 
https://issues.apache.org/jira/browse/PHOENIX-1251
+private static final ListString HINTS = Arrays.asList(, /*+ SKIP_SCAN 
*/);
+//private static final ListString HINTS = Arrays.asList(, /*+ 
SKIP_SCAN */, /*+ RANGE_SCAN */);
 
 /**
  * Tests the given where clause against the given upserts by comparing 
against the list of
@@ -193,14 +198,19 @@ public class InListIT extends BaseHBaseManagedTimeIT {
 }
 conn.commit();
 
-// perform the query
-String sql = SELECT nonPk FROM  + tableName +   + 
whereClause;
-ResultSet rs = 
conn.createStatement().executeQuery(sql);
-for(String expected : expecteds) {
-assertTrue(rs.next());
-assertEquals(expected, rs.getString(1));
+for(String hint : HINTS) {
+String context = where:  + whereClause + , 
type:  + pkType + , salt buckets: 
++ saltBuckets + , multitenant:  + 
isMultiTenant + , hint:  + hint + ;
+
+// perform the query
+String sql = SELECT  + hint +  nonPk FROM  + 
tableName +   + whereClause;
+ResultSet rs = 
conn.createStatement().executeQuery(sql);
+for (String expected : expecteds) {
+assertTrue(did not include result ' + 
expected + ' ( + context + ), rs.next());
+assertEquals(context, expected, 
rs.getString(1));
+}
+assertFalse(context, rs.next());
 }
-assertFalse(rs.next());
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/3ebcbd76/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 041725c..bf3d9db 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
@@ -53,6 +53,7 @@ 

git commit: PHOENIX-1211 Use skip scan when row value constructor uses leading row key columns (Kyle Buzsaki)

2014-09-12 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/master 08d9b98f3 - c51dc12b0


PHOENIX-1211 Use skip scan when row value constructor uses leading row key 
columns (Kyle Buzsaki)


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

Branch: refs/heads/master
Commit: c51dc12b07276ed318982b170446b6867fa12521
Parents: 08d9b98
Author: James Taylor jamestay...@apache.org
Authored: Fri Sep 12 17:21:14 2014 -0700
Committer: James Taylor jamestay...@apache.org
Committed: Fri Sep 12 17:23:47 2014 -0700

--
 .../org/apache/phoenix/end2end/InListIT.java| 24 +---
 .../phoenix/end2end/RowValueConstructorIT.java  | 53 +
 .../org/apache/phoenix/compile/ScanRanges.java  |  6 +-
 .../apache/phoenix/compile/WhereCompiler.java   |  4 +-
 .../apache/phoenix/compile/WhereOptimizer.java  |  6 --
 .../apache/phoenix/filter/SkipScanFilter.java   | 55 +++--
 .../org/apache/phoenix/schema/RowKeySchema.java | 62 ++--
 .../java/org/apache/phoenix/util/ScanUtil.java  | 39 +---
 .../phoenix/compile/WhereOptimizerTest.java |  4 +-
 9 files changed, 202 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c51dc12b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
index c257ccb..fefa2e2 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
@@ -147,6 +147,11 @@ public class InListIT extends BaseHBaseManagedTimeIT {
 private static final ListBoolean TENANCIES = Arrays.asList(false, true);
 private static final ListPDataType INTEGER_TYPES = 
Arrays.asList(PDataType.INTEGER, PDataType.LONG);
 private static final ListInteger SALT_BUCKET_NUMBERS = Arrays.asList(0, 
4);
+
+// we should be including the RANGE_SCAN hint here, but a bug with 
ParallelIterators causes tests to fail
+// see the relevant JIRA here: 
https://issues.apache.org/jira/browse/PHOENIX-1251
+private static final ListString HINTS = Arrays.asList(, /*+ SKIP_SCAN 
*/);
+//private static final ListString HINTS = Arrays.asList(, /*+ 
SKIP_SCAN */, /*+ RANGE_SCAN */);
 
 /**
  * Tests the given where clause against the given upserts by comparing 
against the list of
@@ -176,14 +181,19 @@ public class InListIT extends BaseHBaseManagedTimeIT {
 }
 conn.commit();
 
-// perform the query
-String sql = SELECT nonPk FROM  + tableName +   + 
whereClause;
-ResultSet rs = 
conn.createStatement().executeQuery(sql);
-for(String expected : expecteds) {
-assertTrue(rs.next());
-assertEquals(expected, rs.getString(1));
+for(String hint : HINTS) {
+String context = where:  + whereClause + , 
type:  + pkType + , salt buckets: 
++ saltBuckets + , multitenant:  + 
isMultiTenant + , hint:  + hint + ;
+
+// perform the query
+String sql = SELECT  + hint +  nonPk FROM  + 
tableName +   + whereClause;
+ResultSet rs = 
conn.createStatement().executeQuery(sql);
+for (String expected : expecteds) {
+assertTrue(did not include result ' + 
expected + ' ( + context + ), rs.next());
+assertEquals(context, expected, 
rs.getString(1));
+}
+assertFalse(context, rs.next());
 }
-assertFalse(rs.next());
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c51dc12b/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 041725c..bf3d9db 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
@@ -53,6 

git commit: PHOENIX-1211 Use skip scan when row value constructor uses leading row key columns (Kyle Buzsaki)

2014-09-12 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/3.0 b6341d9aa - f22dffc13


PHOENIX-1211 Use skip scan when row value constructor uses leading row key 
columns (Kyle Buzsaki)


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

Branch: refs/heads/3.0
Commit: f22dffc1375429420e94b96e8d984a6f31cbc618
Parents: b6341d9
Author: James Taylor jamestay...@apache.org
Authored: Fri Sep 12 17:34:53 2014 -0700
Committer: James Taylor jamestay...@apache.org
Committed: Fri Sep 12 17:34:53 2014 -0700

--
 .../org/apache/phoenix/end2end/InListIT.java| 24 +---
 .../phoenix/end2end/RowValueConstructorIT.java  | 53 +
 .../org/apache/phoenix/compile/ScanRanges.java  |  6 +-
 .../apache/phoenix/compile/WhereCompiler.java   |  4 +-
 .../apache/phoenix/compile/WhereOptimizer.java  |  6 --
 .../apache/phoenix/filter/SkipScanFilter.java   | 49 ++--
 .../org/apache/phoenix/schema/RowKeySchema.java | 62 ++--
 .../java/org/apache/phoenix/util/ScanUtil.java  | 39 +---
 .../phoenix/compile/WhereOptimizerTest.java |  4 +-
 9 files changed, 196 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f22dffc1/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
index 524d494..dc60b69 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
@@ -164,6 +164,11 @@ public class InListIT extends BaseHBaseManagedTimeIT {
 private static final ListBoolean TENANCIES = Arrays.asList(false, true);
 private static final ListPDataType INTEGER_TYPES = 
Arrays.asList(PDataType.INTEGER, PDataType.LONG);
 private static final ListInteger SALT_BUCKET_NUMBERS = Arrays.asList(0, 
4);
+
+// we should be including the RANGE_SCAN hint here, but a bug with 
ParallelIterators causes tests to fail
+// see the relevant JIRA here: 
https://issues.apache.org/jira/browse/PHOENIX-1251
+private static final ListString HINTS = Arrays.asList(, /*+ SKIP_SCAN 
*/);
+//private static final ListString HINTS = Arrays.asList(, /*+ 
SKIP_SCAN */, /*+ RANGE_SCAN */);
 
 /**
  * Tests the given where clause against the given upserts by comparing 
against the list of
@@ -193,14 +198,19 @@ public class InListIT extends BaseHBaseManagedTimeIT {
 }
 conn.commit();
 
-// perform the query
-String sql = SELECT nonPk FROM  + tableName +   + 
whereClause;
-ResultSet rs = 
conn.createStatement().executeQuery(sql);
-for(String expected : expecteds) {
-assertTrue(rs.next());
-assertEquals(expected, rs.getString(1));
+for(String hint : HINTS) {
+String context = where:  + whereClause + , 
type:  + pkType + , salt buckets: 
++ saltBuckets + , multitenant:  + 
isMultiTenant + , hint:  + hint + ;
+
+// perform the query
+String sql = SELECT  + hint +  nonPk FROM  + 
tableName +   + whereClause;
+ResultSet rs = 
conn.createStatement().executeQuery(sql);
+for (String expected : expecteds) {
+assertTrue(did not include result ' + 
expected + ' ( + context + ), rs.next());
+assertEquals(context, expected, 
rs.getString(1));
+}
+assertFalse(context, rs.next());
 }
-assertFalse(rs.next());
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f22dffc1/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 041725c..bf3d9db 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
@@ -53,6 +53,7 @@ 

Apache-Phoenix | 4.0 | Hadoop1 | Build Successful

2014-09-12 Thread Apache Jenkins Server
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-hadoop1/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastCompletedBuild/testReport/

Changes
[jamestaylor] PHOENIX-1211 Use skip scan when row value constructor uses leading row key columns (Kyle Buzsaki)



Apache-Phoenix | Master | Hadoop1 | Build Successful

2014-09-12 Thread Apache Jenkins Server
Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git

Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-master-hadoop1/lastSuccessfulBuild/artifact/

Last Complete Test Report https://builds.apache.org/job/Phoenix-master-hadoop1/lastCompletedBuild/testReport/

Changes
[jamestaylor] PHOENIX-1211 Use skip scan when row value constructor uses leading row key columns (Kyle Buzsaki)



Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2014-09-12 Thread Apache Jenkins Server
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
[jamestaylor] PHOENIX-1211 Use skip scan when row value constructor uses leading row key columns (Kyle Buzsaki)



git commit: PHOENIX-1245 Remove usage of empty KeyValue object BATCH_MARKER from Indexer.

2014-09-12 Thread anoopsamjohn
Repository: phoenix
Updated Branches:
  refs/heads/master 20c2d9000 - 20e7559b4


PHOENIX-1245 Remove usage of empty KeyValue object BATCH_MARKER from Indexer.


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

Branch: refs/heads/master
Commit: 20e7559b4406e8e0432d00348686cfd764e2d53e
Parents: 20c2d90
Author: anoopsjohn anoopsamj...@gmail.com
Authored: Sat Sep 13 08:06:51 2014 +0530
Committer: anoopsjohn anoopsamj...@gmail.com
Committed: Sat Sep 13 08:06:51 2014 +0530

--
 .../org/apache/phoenix/hbase/index/Indexer.java | 61 ++--
 1 file changed, 4 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/20e7559b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java
index 975621c..c170c89 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java
@@ -106,14 +106,6 @@ public class Indexer extends BaseRegionObserver {
   private static final String INDEX_RECOVERY_FAILURE_POLICY_KEY = 
org.apache.hadoop.hbase.index.recovery.failurepolicy;
 
   /**
-   * Marker {@link KeyValue} to indicate that we are doing a batch operation. 
Needed because the
-   * coprocessor framework throws away the WALEdit from the prePut/preDelete 
hooks when checking a
-   * batch if there were no {@link KeyValue}s attached to the {@link WALEdit}. 
When you get down to
-   * the preBatch hook, there won't be any WALEdits to which to add the index 
updates.
-   */
-  private static KeyValue BATCH_MARKER = new KeyValue();
-
-  /**
* cache the failed updates to the various regions. Used for making the WAL 
recovery mechanisms
* more robust in the face of recoverying index regions that were on the 
same server as the
* primary table region
@@ -201,43 +193,6 @@ public class Indexer extends BaseRegionObserver {
   }
 
   @Override
-  public void prePut(final ObserverContextRegionCoprocessorEnvironment c, 
final Put put,
-  final WALEdit edit, final Durability durability) throws IOException {
-  if (this.disabled) {
-  super.prePut(c, put, edit, durability);
-  return;
-  }
-  preSingleUpdate(c, put, edit, durability);
-  }
-
-  @Override
-  public void preDelete(ObserverContextRegionCoprocessorEnvironment e, 
Delete delete,
-  WALEdit edit, final Durability durability) throws IOException {
-  if (this.disabled) {
-  super.preDelete(e, delete, edit, durability);
-  return;
-  }
-  preSingleUpdate(e, delete, edit, durability);
-  }
-
-  /**
-   * Process the prePut and preDelete methods. These need to be handled so the 
preBatchMutate method
-   * can function properly.
-   * p
-   * As of HBase 0.96, these can all go through the same mechanism as puts and 
deletes all go
-   * through the batchMutation mechanism in HRegion. Previously, {@link 
Delete} had a separate path,
-   * which caused some interesting problems for managing WALs, but see older 
versions of Phoenix for
-   * more information there.
-   */
-  @SuppressWarnings(javadoc)
-  public void preSingleUpdate(final 
ObserverContextRegionCoprocessorEnvironment c, final Mutation put,
-  final WALEdit edit, final Durability durability) throws IOException {
-  // just have to add a batch marker to the WALEdit so we get the edit 
again in the batch
-  // processing step. We let it throw an exception here because something 
terrible has happened.
-  edit.add(BATCH_MARKER);
-  }
-
-  @Override
   public void preBatchMutate(ObserverContextRegionCoprocessorEnvironment c,
   MiniBatchOperationInProgressMutation miniBatchOp) throws IOException {
   if (this.disabled) {
@@ -269,18 +224,6 @@ public class Indexer extends BaseRegionObserver {
 }
 Durability durability = Durability.SKIP_WAL;
 for (int i = 0; i  miniBatchOp.size(); i++) {
-  // remove the batch keyvalue marker - its added for all puts
-  WALEdit edit = miniBatchOp.getWalEdit(i);
-  // we don't have a WALEdit for immutable index cases, which still see 
this path
-  // we could check is indexing is enable for the mutation in prePut and 
then just skip this
-  // after checking here, but this saves us the checking again.
-  if (edit != null) {
-KeyValue kv = edit.getKeyValues().get(0);
-if (kv == BATCH_MARKER) {
-  // remove batch marker 

git commit: PHOENIX-1245 Remove usage of empty KeyValue object BATCH_MARKER from Indexer.

2014-09-12 Thread anoopsamjohn
Repository: phoenix
Updated Branches:
  refs/heads/4.0 ce1dd85a5 - caa7848cf


PHOENIX-1245 Remove usage of empty KeyValue object BATCH_MARKER from Indexer.


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

Branch: refs/heads/4.0
Commit: caa7848cfc89461545e3ab7f9ff902f474446b5b
Parents: ce1dd85
Author: anoopsjohn anoopsamj...@gmail.com
Authored: Sat Sep 13 08:15:28 2014 +0530
Committer: anoopsjohn anoopsamj...@gmail.com
Committed: Sat Sep 13 08:15:28 2014 +0530

--
 .../org/apache/phoenix/hbase/index/Indexer.java | 61 ++--
 1 file changed, 4 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/caa7848c/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java
index 975621c..c170c89 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java
@@ -106,14 +106,6 @@ public class Indexer extends BaseRegionObserver {
   private static final String INDEX_RECOVERY_FAILURE_POLICY_KEY = 
org.apache.hadoop.hbase.index.recovery.failurepolicy;
 
   /**
-   * Marker {@link KeyValue} to indicate that we are doing a batch operation. 
Needed because the
-   * coprocessor framework throws away the WALEdit from the prePut/preDelete 
hooks when checking a
-   * batch if there were no {@link KeyValue}s attached to the {@link WALEdit}. 
When you get down to
-   * the preBatch hook, there won't be any WALEdits to which to add the index 
updates.
-   */
-  private static KeyValue BATCH_MARKER = new KeyValue();
-
-  /**
* cache the failed updates to the various regions. Used for making the WAL 
recovery mechanisms
* more robust in the face of recoverying index regions that were on the 
same server as the
* primary table region
@@ -201,43 +193,6 @@ public class Indexer extends BaseRegionObserver {
   }
 
   @Override
-  public void prePut(final ObserverContextRegionCoprocessorEnvironment c, 
final Put put,
-  final WALEdit edit, final Durability durability) throws IOException {
-  if (this.disabled) {
-  super.prePut(c, put, edit, durability);
-  return;
-  }
-  preSingleUpdate(c, put, edit, durability);
-  }
-
-  @Override
-  public void preDelete(ObserverContextRegionCoprocessorEnvironment e, 
Delete delete,
-  WALEdit edit, final Durability durability) throws IOException {
-  if (this.disabled) {
-  super.preDelete(e, delete, edit, durability);
-  return;
-  }
-  preSingleUpdate(e, delete, edit, durability);
-  }
-
-  /**
-   * Process the prePut and preDelete methods. These need to be handled so the 
preBatchMutate method
-   * can function properly.
-   * p
-   * As of HBase 0.96, these can all go through the same mechanism as puts and 
deletes all go
-   * through the batchMutation mechanism in HRegion. Previously, {@link 
Delete} had a separate path,
-   * which caused some interesting problems for managing WALs, but see older 
versions of Phoenix for
-   * more information there.
-   */
-  @SuppressWarnings(javadoc)
-  public void preSingleUpdate(final 
ObserverContextRegionCoprocessorEnvironment c, final Mutation put,
-  final WALEdit edit, final Durability durability) throws IOException {
-  // just have to add a batch marker to the WALEdit so we get the edit 
again in the batch
-  // processing step. We let it throw an exception here because something 
terrible has happened.
-  edit.add(BATCH_MARKER);
-  }
-
-  @Override
   public void preBatchMutate(ObserverContextRegionCoprocessorEnvironment c,
   MiniBatchOperationInProgressMutation miniBatchOp) throws IOException {
   if (this.disabled) {
@@ -269,18 +224,6 @@ public class Indexer extends BaseRegionObserver {
 }
 Durability durability = Durability.SKIP_WAL;
 for (int i = 0; i  miniBatchOp.size(); i++) {
-  // remove the batch keyvalue marker - its added for all puts
-  WALEdit edit = miniBatchOp.getWalEdit(i);
-  // we don't have a WALEdit for immutable index cases, which still see 
this path
-  // we could check is indexing is enable for the mutation in prePut and 
then just skip this
-  // after checking here, but this saves us the checking again.
-  if (edit != null) {
-KeyValue kv = edit.getKeyValues().get(0);
-if (kv == BATCH_MARKER) {
-  // remove batch marker from the 

Build failed in Jenkins: Phoenix | Master | Hadoop1 #362

2014-09-12 Thread Apache Jenkins Server
See https://builds.apache.org/job/Phoenix-master-hadoop1/362/changes

Changes:

[anoopsamjohn] PHOENIX-1245 Remove usage of empty KeyValue object BATCH_MARKER 
from Indexer.

--
[...truncated 10 lines...]
  git config core.sparsecheckout
  git checkout -f 20e7559b4406e8e0432d00348686cfd764e2d53e
  git rev-list 20c2d9000ab593e79c75f892e3a2d310abca7c67
No emails were triggered.
[Phoenix-master-hadoop1] $ /bin/bash -xe /tmp/hudson1882890618052170870.sh
[Phoenix-master-hadoop1] $ /home/jenkins/tools/maven/apache-maven-3.0.4/bin/mvn 
clean install
[INFO] Scanning for projects...
[INFO] 
[INFO] Reactor Build Order:
[INFO] 
[INFO] Apache Phoenix
[INFO] Phoenix Hadoop Compatibility
[INFO] Phoenix Hadoop1 Compatibility
[INFO] Phoenix Core
[INFO] Phoenix - Flume
[INFO] Phoenix - Pig
[INFO] Phoenix Assembly
[INFO] 
[INFO] 
[INFO] Building Apache Phoenix 5.0.0-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ phoenix ---
[INFO] Deleting https://builds.apache.org/job/Phoenix-master-hadoop1/ws/target
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ phoenix ---
[INFO] 
[INFO] --- maven-source-plugin:2.2.1:jar-no-fork (attach-sources) @ phoenix ---
[INFO] 
[INFO] --- maven-jar-plugin:2.4:test-jar (default) @ phoenix ---
[WARNING] JAR will be empty - no content was marked for inclusion!
[INFO] Building jar: 
https://builds.apache.org/job/Phoenix-master-hadoop1/362/artifact/target/phoenix-5.0.0-SNAPSHOT-tests.jar
[INFO] 
[INFO] --- maven-site-plugin:3.2:attach-descriptor (attach-descriptor) @ 
phoenix ---
[INFO] 
[INFO] --- maven-install-plugin:2.5.1:install (default-install) @ phoenix ---
[INFO] Installing 
https://builds.apache.org/job/Phoenix-master-hadoop1/ws/pom.xml to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix/5.0.0-SNAPSHOT/phoenix-5.0.0-SNAPSHOT.pom
[INFO] Installing 
https://builds.apache.org/job/Phoenix-master-hadoop1/362/artifact/target/phoenix-5.0.0-SNAPSHOT-tests.jar
 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix/5.0.0-SNAPSHOT/phoenix-5.0.0-SNAPSHOT-tests.jar
[INFO] 
[INFO] 
[INFO] Building Phoenix Hadoop Compatibility 5.0.0-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ phoenix-hadoop-compat 
---
[INFO] Deleting 
https://builds.apache.org/job/Phoenix-master-hadoop1/ws/phoenix-hadoop-compat/target
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ 
phoenix-hadoop-compat ---
[INFO] 
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ 
phoenix-hadoop-compat ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 
https://builds.apache.org/job/Phoenix-master-hadoop1/ws/phoenix-hadoop-compat/src/main/resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ 
phoenix-hadoop-compat ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 10 source files to 
https://builds.apache.org/job/Phoenix-master-hadoop1/ws/phoenix-hadoop-compat/target/classes
[INFO] 
[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ 
phoenix-hadoop-compat ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 
https://builds.apache.org/job/Phoenix-master-hadoop1/ws/phoenix-hadoop-compat/src/test/resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ 
phoenix-hadoop-compat ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 2 source files to 
https://builds.apache.org/job/Phoenix-master-hadoop1/ws/phoenix-hadoop-compat/target/test-classes
[INFO] 
[INFO] --- maven-surefire-plugin:2.16:test (default-test) @ 
phoenix-hadoop-compat ---
[INFO] 
[INFO] --- maven-source-plugin:2.2.1:jar-no-fork (attach-sources) @ 
phoenix-hadoop-compat ---
[INFO] Building jar: 
https://builds.apache.org/job/Phoenix-master-hadoop1/362/artifact/phoenix-hadoop-compat/target/phoenix-hadoop-compat-5.0.0-SNAPSHOT-sources.jar
[INFO] 
[INFO] --- maven-jar-plugin:2.4:test-jar (default) @ phoenix-hadoop-compat ---
[INFO] Building jar: 
https://builds.apache.org/job/Phoenix-master-hadoop1/362/artifact/phoenix-hadoop-compat/target/phoenix-hadoop-compat-5.0.0-SNAPSHOT-tests.jar
[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ phoenix-hadoop-compat ---
[INFO] Building jar: 

Build failed in Jenkins: Phoenix | 4.0 | Hadoop1 #311

2014-09-12 Thread Apache Jenkins Server
See https://builds.apache.org/job/Phoenix-4.0-hadoop1/311/changes

Changes:

[anoopsamjohn] PHOENIX-1245 Remove usage of empty KeyValue object BATCH_MARKER 
from Indexer.

--
[...truncated 7 lines...]
  git fetch --tags --progress 
  https://git-wip-us.apache.org/repos/asf/phoenix.git 
  +refs/heads/*:refs/remotes/origin/*
  git rev-parse origin/4.0^{commit}
Checking out Revision caa7848cfc89461545e3ab7f9ff902f474446b5b (origin/4.0)
  git config core.sparsecheckout
  git checkout -f caa7848cfc89461545e3ab7f9ff902f474446b5b
  git rev-list ce1dd85a5e84c5bcb1a94fa716d02a9150a8ed64
No emails were triggered.
[Phoenix-4.0-hadoop1] $ /bin/bash -xe /tmp/hudson641139299917200480.sh
[Phoenix-4.0-hadoop1] $ 
/home/jenkins/jenkins-slave/tools/hudson.tasks.Maven_MavenInstallation/Maven_3.0.3/bin/mvn
 clean install
[INFO] Scanning for projects...
[INFO] 
[INFO] Reactor Build Order:
[INFO] 
[INFO] Apache Phoenix
[INFO] Phoenix Hadoop Compatibility
[INFO] Phoenix Hadoop1 Compatibility
[INFO] Phoenix Core
[INFO] Phoenix - Flume
[INFO] Phoenix - Pig
[INFO] Phoenix Assembly
[INFO] 
[INFO] 
[INFO] Building Apache Phoenix 4.2.0-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ phoenix ---
[INFO] Deleting https://builds.apache.org/job/Phoenix-4.0-hadoop1/ws/target
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ phoenix ---
[INFO] 
[INFO] --- maven-source-plugin:2.2.1:jar-no-fork (attach-sources) @ phoenix ---
[INFO] 
[INFO] --- maven-jar-plugin:2.4:test-jar (default) @ phoenix ---
[WARNING] JAR will be empty - no content was marked for inclusion!
[INFO] Building jar: 
https://builds.apache.org/job/Phoenix-4.0-hadoop1/311/artifact/target/phoenix-4.2.0-SNAPSHOT-tests.jar
[INFO] 
[INFO] --- maven-site-plugin:3.2:attach-descriptor (attach-descriptor) @ 
phoenix ---
[INFO] 
[INFO] --- maven-install-plugin:2.5.1:install (default-install) @ phoenix ---
[INFO] Installing 
https://builds.apache.org/job/Phoenix-4.0-hadoop1/ws/pom.xml to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix/4.2.0-SNAPSHOT/phoenix-4.2.0-SNAPSHOT.pom
[INFO] Installing 
https://builds.apache.org/job/Phoenix-4.0-hadoop1/311/artifact/target/phoenix-4.2.0-SNAPSHOT-tests.jar
 to 
/home/jenkins/.m2/repository/org/apache/phoenix/phoenix/4.2.0-SNAPSHOT/phoenix-4.2.0-SNAPSHOT-tests.jar
[INFO] 
[INFO] 
[INFO] Building Phoenix Hadoop Compatibility 4.2.0-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ phoenix-hadoop-compat 
---
[INFO] Deleting 
https://builds.apache.org/job/Phoenix-4.0-hadoop1/ws/phoenix-hadoop-compat/target
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ 
phoenix-hadoop-compat ---
[INFO] 
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ 
phoenix-hadoop-compat ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 
https://builds.apache.org/job/Phoenix-4.0-hadoop1/ws/phoenix-hadoop-compat/src/main/resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ 
phoenix-hadoop-compat ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 10 source files to 
https://builds.apache.org/job/Phoenix-4.0-hadoop1/ws/phoenix-hadoop-compat/target/classes
[INFO] 
[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ 
phoenix-hadoop-compat ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 
https://builds.apache.org/job/Phoenix-4.0-hadoop1/ws/phoenix-hadoop-compat/src/test/resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ 
phoenix-hadoop-compat ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 2 source files to 
https://builds.apache.org/job/Phoenix-4.0-hadoop1/ws/phoenix-hadoop-compat/target/test-classes
[INFO] 
[INFO] --- maven-surefire-plugin:2.16:test (default-test) @ 
phoenix-hadoop-compat ---
[INFO] 
[INFO] --- maven-source-plugin:2.2.1:jar-no-fork (attach-sources) @ 
phoenix-hadoop-compat ---
[INFO] Building jar: 
https://builds.apache.org/job/Phoenix-4.0-hadoop1/311/artifact/phoenix-hadoop-compat/target/phoenix-hadoop-compat-4.2.0-SNAPSHOT-sources.jar
[INFO] 
[INFO] --- maven-jar-plugin:2.4:test-jar (default) @ phoenix-hadoop-compat ---
[INFO] Building jar: