From 18d172a95710c85bb5e2afea83f2c41889d71597 Mon Sep 17 00:00:00 2001
From: tedyu <yuzhihong@gmail.com>
Date: Thu, 23 Apr 2015 18:12:15 -0700
Subject: [PATCH 1/3] SPARK-7107 Add parameter for zookeeper.znode.parent to
 hbase_inputformat.py

---
 examples/src/main/python/hbase_inputformat.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/src/main/python/hbase_inputformat.py b/examples/src/main/python/hbase_inputformat.py
index e17819d5feb76..68e2a4c35d631 100644
--- a/examples/src/main/python/hbase_inputformat.py
+++ b/examples/src/main/python/hbase_inputformat.py
@@ -54,8 +54,9 @@
 
         Run with example jar:
         ./bin/spark-submit --driver-class-path /path/to/example/jar \
-        /path/to/examples/hbase_inputformat.py <host> <table>
+        /path/to/examples/hbase_inputformat.py <host> <table> [<znode>]
         Assumes you have some data in HBase already, running on <host>, in <table>
+          optionally, you can specify the parent znode for your hbase cluster - <znode>
         """, file=sys.stderr)
         exit(-1)
 
@@ -64,6 +65,8 @@
     sc = SparkContext(appName="HBaseInputFormat")
 
     conf = {"hbase.zookeeper.quorum": host, "hbase.mapreduce.inputtable": table}
+    if len(sys.argv) > 3:
+      conf = {"hbase.zookeeper.quorum": host, "zookeeper.znode.parent": sys.argv[3], "hbase.mapreduce.inputtable": table}
     keyConv = "org.apache.spark.examples.pythonconverters.ImmutableBytesWritableToStringConverter"
     valueConv = "org.apache.spark.examples.pythonconverters.HBaseResultToStringConverter"
 

From 6e25939102d6da73eb6cf7d2f4bcc0335d9076cb Mon Sep 17 00:00:00 2001
From: tedyu <yuzhihong@gmail.com>
Date: Fri, 24 Apr 2015 14:17:12 -0700
Subject: [PATCH 2/3] Adjust line length to be shorter than 100 characters

---
 examples/src/main/python/hbase_inputformat.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/examples/src/main/python/hbase_inputformat.py b/examples/src/main/python/hbase_inputformat.py
index 68e2a4c35d631..14c29849df567 100644
--- a/examples/src/main/python/hbase_inputformat.py
+++ b/examples/src/main/python/hbase_inputformat.py
@@ -56,7 +56,7 @@
         ./bin/spark-submit --driver-class-path /path/to/example/jar \
         /path/to/examples/hbase_inputformat.py <host> <table> [<znode>]
         Assumes you have some data in HBase already, running on <host>, in <table>
-          optionally, you can specify the parent znode for your hbase cluster - <znode>
+          optionally, you can specify parent znode for your hbase cluster - <znode>
         """, file=sys.stderr)
         exit(-1)
 
@@ -66,7 +66,8 @@
 
     conf = {"hbase.zookeeper.quorum": host, "hbase.mapreduce.inputtable": table}
     if len(sys.argv) > 3:
-      conf = {"hbase.zookeeper.quorum": host, "zookeeper.znode.parent": sys.argv[3], "hbase.mapreduce.inputtable": table}
+      conf = {"hbase.zookeeper.quorum": host, "zookeeper.znode.parent": sys.argv[3],
+        "hbase.mapreduce.inputtable": table}
     keyConv = "org.apache.spark.examples.pythonconverters.ImmutableBytesWritableToStringConverter"
     valueConv = "org.apache.spark.examples.pythonconverters.HBaseResultToStringConverter"
 

From ab7c72b486106a98bafb70b61125ed84f1d01cdd Mon Sep 17 00:00:00 2001
From: tedyu <yuzhihong@gmail.com>
Date: Mon, 27 Apr 2015 12:38:06 -0700
Subject: [PATCH 3/3] SPARK-7107 Adjust indentation to pass Python style tests

---
 examples/src/main/python/hbase_inputformat.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/src/main/python/hbase_inputformat.py b/examples/src/main/python/hbase_inputformat.py
index 14c29849df567..5b82a14fba413 100644
--- a/examples/src/main/python/hbase_inputformat.py
+++ b/examples/src/main/python/hbase_inputformat.py
@@ -66,8 +66,8 @@
 
     conf = {"hbase.zookeeper.quorum": host, "hbase.mapreduce.inputtable": table}
     if len(sys.argv) > 3:
-      conf = {"hbase.zookeeper.quorum": host, "zookeeper.znode.parent": sys.argv[3],
-        "hbase.mapreduce.inputtable": table}
+        conf = {"hbase.zookeeper.quorum": host, "zookeeper.znode.parent": sys.argv[3],
+                "hbase.mapreduce.inputtable": table}
     keyConv = "org.apache.spark.examples.pythonconverters.ImmutableBytesWritableToStringConverter"
     valueConv = "org.apache.spark.examples.pythonconverters.HBaseResultToStringConverter"