coder-yun
diff --git a/‎examples/spark-hbase-demo1.md
Lines changed: 15 additions & 45 deletions b/‎examples/spark-hbase-demo1.md
Lines changed: 15 additions & 45 deletions
diff --git a/‎examples/spark-hbase-demo2.md
Lines changed: 45 additions & 15 deletions b/‎examples/spark-hbase-demo2.md
Lines changed: 45 additions & 15 deletions
diff --git a/‎src/test/resources/users.parquet/._SUCCESS.crc
-8 Bytes b/‎src/test/resources/users.parquet/._SUCCESS.crc
-8 Bytes
diff --git a/‎src/test/resources/users.parquet/._common_metadata.crc
-12 Bytes b/‎src/test/resources/users.parquet/._common_metadata.crc
-12 Bytes
diff --git a/‎src/test/resources/users.parquet/._metadata.crc
-16 Bytes b/‎src/test/resources/users.parquet/._metadata.crc
-16 Bytes
@@ -1,55 +1,25 @@
-## Example 1: Create and query SparkSQL table map to a new HBase table (multiple columns map to hbase table rowkey)
-In this example, we create a new SparkSQL table and map it to a new HBase table with multiple column in rowkey.
+## Example 2: Create and query SparkSQL table map to existing Hbase table
+In this example, we create SparkSQL table and map it to a existing HBase table. (a single column map to hbase rowkey)
 
 Steps:
-
-(1) Create table in hbase-sql shell:
-```
-$SPARK_HBASE_Home/bin/hbase-sql
-CREATE TABLE teacher(grade int, class int, subject string, teacher_name string, teacher_age int, PRIMARY KEY (grade, class, subject)) MAPPED BY (hbase_teacher, COLS=[teacher_name=teacher.name, teacher_age=teacher.age]);
+(1) Create table and populate data in HBase shell
 ```
+$HBase_Home/bin/hbase shell
+create 'hbase_numbers', 'f'
+for i in '1'..'100' do for j in '1'..'2' do put 'hbase_numbers', "row#{i}", "f:c#{j}", "#{i}#{j}" end end
+```   
 
-This command will create following tables:
-Tables :
-
-  spark :  teacher
-  
-  hbase :  hbase_teacher
-  
-Fields :
-
-  [grade,int]
-  
-  [class,int]
-  
-  [subject,string]
-  
-  [teacher_name,string]
-  
-  [teacher_age,int]
-
-  key columns : grade,class,subject
-  non-key colums: teacher_name, teacher_age
-  
-(2) Load data from a csv data file:
+(2) Map hbase table with sparksql table in hbase-sql shell
 ```
-LOAD DATA INPATH './examples/teacher1k.csv' INTO TABLE teacher FIELDS TERMINATED BY "," ;
+$SPARK_HBASE_Home/bin/hbase-sql
+CREATE TABLE numbers(rowkey STRING, a STRING, b STRING, PRIMARY KEY (rowkey)) MAPPED BY (hbase_numbers, COLS=[a=f.c1, b=f.c2]);
 ```
 
-(3) Query :
+(3) Query:
 ```
-    // test where
-    (1) select teacher_name,teacher_age from teacher where teacher_age > 25;
-
-    // test like in
-    (2) select teacher_name,teacher_age,subject from teacher where teacher_name is not null and teacher_name like 'teacher_2_3%' and teacher_age not in (20,21,22,23,24,25)
-
-    // test subquery
-    (3) select t1.teacher_name,t1.teacher_age from (select * from teacher where teacher_name like 'teacher_2_3%') t1 where t1.teacher_age < 25
-
-    //test group by
-    (4) select teacher_name, sum(teacher_age) from teacher where grade=1 group by teacher_name
+   // test count *
+   (1) select count(*) from numbers
 
-    //test join
-    (5) select t1.teacher_name, t2.subject, t1.teacher_age from (select teacher_name, teacher_age from teacher where teacher_age >=26 ) t1 join  (select teacher_name, subject from teacher where teacher_name like 'teacher_2_3%')t2 on t1.teacher_name=t2.teacher_name
+   // test group by
+   (2) select a, b from numbers where b > "980"
 ```
@@ -1,25 +1,55 @@
-## Example 2: Create and query SparkSQL table map to existing Hbase table
-In this example, we create SparkSQL table and map it to a existing HBase table. (a single column map to hbase rowkey)
+## Example 1: Create and query SparkSQL table map to a new HBase table (multiple columns map to hbase table rowkey)
+In this example, we create a new SparkSQL table and map it to a new HBase table with multiple column in rowkey.
 
 Steps:
-(1) Create table and populate data in HBase shell
-```
-$HBase_Home/bin/hbase shell
-create 'hbase_numbers', 'f'
-for i in '1'..'100' do for j in '1'..'2' do put 'hbase_numbers', "row#{i}", "f:c#{j}", "#{i}#{j}" end end
-```   
 
-(2) Map hbase table with sparksql table in hbase-sql shell
+(1) Create table in hbase-sql shell:
 ```
 $SPARK_HBASE_Home/bin/hbase-sql
-CREATE TABLE numbers(rowkey STRING, a STRING, b STRING, PRIMARY KEY (rowkey)) MAPPED BY (hbase_numbers, COLS=[a=f.c1, b=f.c2]);
+CREATE TABLE teacher(grade int, class int, subject string, teacher_name string, teacher_age int, PRIMARY KEY (grade, class, subject)) MAPPED BY (hbase_teacher, COLS=[teacher_name=teacher.name, teacher_age=teacher.age]);
+```
+
+This command will create following tables:
+Tables :
+
+  spark :  teacher
+  
+  hbase :  hbase_teacher
+  
+Fields :
+
+  [grade,int]
+  
+  [class,int]
+  
+  [subject,string]
+  
+  [teacher_name,string]
+  
+  [teacher_age,int]
+
+  key columns : grade,class,subject
+  non-key colums: teacher_name, teacher_age
+  
+(2) Load data from a csv data file:
+```
+LOAD DATA INPATH './examples/teacher1k.csv' INTO TABLE teacher FIELDS TERMINATED BY "," ;
 ```
 
-(3) Query:
+(3) Query :
 ```
-   // test count *
-   (1) select count(*) from numbers
+    // test where
+    (1) select teacher_name,teacher_age from teacher where teacher_age > 25;
+
+    // test like in
+    (2) select teacher_name,teacher_age,subject from teacher where teacher_name is not null and teacher_name like 'teacher_2_3%' and teacher_age not in (20,21,22,23,24,25)
+
+    // test subquery
+    (3) select t1.teacher_name,t1.teacher_age from (select * from teacher where teacher_name like 'teacher_2_3%') t1 where t1.teacher_age < 25
+
+    //test group by
+    (4) select teacher_name, sum(teacher_age) from teacher where grade=1 group by teacher_name
 
-   // test group by
-   (2) select a, b from numbers where b > "980"
+    //test join
+    (5) select t1.teacher_name, t2.subject, t1.teacher_age from (select teacher_name, teacher_age from teacher where teacher_age >=26 ) t1 join  (select teacher_name, subject from teacher where teacher_name like 'teacher_2_3%')t2 on t1.teacher_name=t2.teacher_name
 ```