update example

jackylk · jackylk · commit 8f75b162f4af · 2015-07-21T14:02:38.000-07:00
diff --git a/examples/spark-hbase-demo1.md b/examples/spark-hbase-demo1.md
@@ -5,13 +5,13 @@ Steps:
 (1) Create table in hbase-sql shell:
 ```
 $SPARK_HBASE_Home/bin/hbase-sql
-CREATE TABLE teacher1k(grade int, class int, subject string, teacher_name string, teacher_age int, PRIMARY KEY (grade, class, subject)) MAPPED BY (hbase1k, COLS=[teacher_name=teacher.name, teacher_age=teacher.age]);
+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 :  teacher1k
-  hbase :  hbase1k
+  spark :  teacher
+  hbase :  hbase_teacher
   
 Fields :
   [grade,int]
@@ -25,23 +25,23 @@ Fields :
   
 (2) Load data from a csv data file:
 ```
-LOAD DATA INPATH './examples/teacher1k.csv' INTO TABLE teacher1k FIELDS TERMINATED BY "," ;
+LOAD DATA INPATH './examples/teacher1k.csv' INTO TABLE teacher FIELDS TERMINATED BY "," ;
 ```
 
 (3) Query :
 ```
     // test where
-    (1) select teacher_name,teacher_age from teacher1k where teacher_age > 25;
+    (1) select teacher_name,teacher_age from teacher where teacher_age > 25;
 
     // test like in
-    (2) select teacher_name,teacher_age,subject from teacher1k where teacher_name is not null and teacher_name like 'teacher_2_3%' and teacher_age not in (20,21,22,23,24,25)
+    (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 teacher1k where teacher_name like 'teacher_2_3%') t1 where t1.teacher_age < 25
+    (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 teacher1k where grade=1 group by teacher_name
+    (4) select teacher_name, sum(teacher_age) from teacher where grade=1 group by teacher_name
 
     //test join
-    (5) select t1.teacher_name, t2.subject, t1.teacher_age from (select teacher_name, teacher_age from teacher1k where teacher_age >=26 ) t1 join  (select teacher_name, subject from teacher1k where teacher_name like 'teacher_2_3%')t2 on t1.teacher_name=t2.teacher_name
+    (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
 ```
diff --git a/examples/spark-hbase-demo2.md b/examples/spark-hbase-demo2.md
@@ -5,21 +5,21 @@ Steps:
 (1) Create table and populate data in HBase shell
 ```
 $HBase_Home/bin/hbase shell
-create 'hbase1k', 'f'
-for i in '1'..'1000' do for j in '1'..'2' do put 'hbase10k', "row#{i}", "f:c#{j}", "#{i}#{j}" end end
+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
 ```
 $SPARK_HBASE_Home/bin/hbase-sql
-CREATE TABLE spark1k(rowkey STRING, a STRING, b STRING, PRIMARY KEY (rowkey)) MAPPED BY (hbase1k, COLS=[a=f.c1, b=f.c2]);
+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:
 ```
    // test count *
-   (1) select count(*) from spark1k
+   (1) select count(*) from numbers
 
    // test group by
-   (2) select a, b from spark1k where b > "980"
+   (2) select a, b from numbers where b > "980"
 ```
