Skip to content

Commit a324f6f

Browse files
yzhou2001yzhou2001
committed
HBase 1.1 Support
1 parent 0359128 commit a324f6f

26 files changed

+958
-850
lines changed

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,5 @@ You can also make those setting to be the default by setting to the "Defaults ->
120120

121121
Please refer to the [Configuration guide](http://spark.apache.org/docs/latest/configuration.html)
122122
in the online documentation for an overview on how to configure Spark.
123+
124+
For HBase 1.1, it is recommended to use higher "open files" and "max user processes" ulimit values. A typical value is 65536(64K).

‎pom.xml

Lines changed: 1 addition & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<project.version>1.4.0</project.version>
3939
<spark.version>1.4.0</spark.version>
4040
<hadoop.version>2.4.0</hadoop.version>
41-
<hbase.version>0.98.5-hadoop2</hbase.version>
41+
<hbase.version>1.1.2</hbase.version>
4242

4343
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4444
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -236,10 +236,6 @@
236236
<groupId>io.netty</groupId>
237237
<artifactId>netty</artifactId>
238238
</exclusion>
239-
<exclusion>
240-
<groupId>commons-logging</groupId>
241-
<artifactId>commons-logging</artifactId>
242-
</exclusion>
243239
<exclusion>
244240
<groupId>org.jruby</groupId>
245241
<artifactId>jruby-complete</artifactId>
@@ -265,10 +261,6 @@
265261
<groupId>io.netty</groupId>
266262
<artifactId>netty</artifactId>
267263
</exclusion>
268-
<exclusion>
269-
<groupId>commons-logging</groupId>
270-
<artifactId>commons-logging</artifactId>
271-
</exclusion>
272264
<exclusion>
273265
<groupId>org.jruby</groupId>
274266
<artifactId>jruby-complete</artifactId>
@@ -292,10 +284,6 @@
292284
<groupId>io.netty</groupId>
293285
<artifactId>netty</artifactId>
294286
</exclusion>
295-
<exclusion>
296-
<groupId>commons-logging</groupId>
297-
<artifactId>commons-logging</artifactId>
298-
</exclusion>
299287
<exclusion>
300288
<groupId>org.jruby</groupId>
301289
<artifactId>jruby-complete</artifactId>
@@ -319,10 +307,6 @@
319307
<groupId>io.netty</groupId>
320308
<artifactId>netty</artifactId>
321309
</exclusion>
322-
<exclusion>
323-
<groupId>commons-logging</groupId>
324-
<artifactId>commons-logging</artifactId>
325-
</exclusion>
326310
<exclusion>
327311
<groupId>org.jruby</groupId>
328312
<artifactId>jruby-complete</artifactId>
@@ -348,10 +332,6 @@
348332
<groupId>io.netty</groupId>
349333
<artifactId>netty</artifactId>
350334
</exclusion>
351-
<exclusion>
352-
<groupId>commons-logging</groupId>
353-
<artifactId>commons-logging</artifactId>
354-
</exclusion>
355335
<exclusion>
356336
<groupId>org.jruby</groupId>
357337
<artifactId>jruby-complete</artifactId>
@@ -375,10 +355,6 @@
375355
<groupId>io.netty</groupId>
376356
<artifactId>netty</artifactId>
377357
</exclusion>
378-
<exclusion>
379-
<groupId>commons-logging</groupId>
380-
<artifactId>commons-logging</artifactId>
381-
</exclusion>
382358
<exclusion>
383359
<groupId>org.jruby</groupId>
384360
<artifactId>jruby-complete</artifactId>
@@ -402,10 +378,6 @@
402378
<groupId>io.netty</groupId>
403379
<artifactId>netty</artifactId>
404380
</exclusion>
405-
<exclusion>
406-
<groupId>commons-logging</groupId>
407-
<artifactId>commons-logging</artifactId>
408-
</exclusion>
409381
<exclusion>
410382
<groupId>org.jruby</groupId>
411383
<artifactId>jruby-complete</artifactId>
@@ -431,10 +403,6 @@
431403
<groupId>io.netty</groupId>
432404
<artifactId>netty</artifactId>
433405
</exclusion>
434-
<exclusion>
435-
<groupId>commons-logging</groupId>
436-
<artifactId>commons-logging</artifactId>
437-
</exclusion>
438406
<exclusion>
439407
<groupId>org.jruby</groupId>
440408
<artifactId>jruby-complete</artifactId>
@@ -458,10 +426,6 @@
458426
<groupId>io.netty</groupId>
459427
<artifactId>netty</artifactId>
460428
</exclusion>
461-
<exclusion>
462-
<groupId>commons-logging</groupId>
463-
<artifactId>commons-logging</artifactId>
464-
</exclusion>
465429
<exclusion>
466430
<groupId>org.jruby</groupId>
467431
<artifactId>jruby-complete</artifactId>
@@ -491,10 +455,6 @@
491455
<groupId>io.netty</groupId>
492456
<artifactId>netty</artifactId>
493457
</exclusion>
494-
<exclusion>
495-
<groupId>commons-logging</groupId>
496-
<artifactId>commons-logging</artifactId>
497-
</exclusion>
498458
<exclusion>
499459
<groupId>org.jruby</groupId>
500460
<artifactId>jruby-complete</artifactId>
@@ -608,10 +568,6 @@
608568
<groupId>io.netty</groupId>
609569
<artifactId>netty</artifactId>
610570
</exclusion>
611-
<exclusion>
612-
<groupId>commons-logging</groupId>
613-
<artifactId>commons-logging</artifactId>
614-
</exclusion>
615571
<exclusion>
616572
<groupId>org.jruby</groupId>
617573
<artifactId>jruby-complete</artifactId>
@@ -643,10 +599,6 @@
643599
<groupId>io.netty</groupId>
644600
<artifactId>netty</artifactId>
645601
</exclusion>
646-
<exclusion>
647-
<groupId>commons-logging</groupId>
648-
<artifactId>commons-logging</artifactId>
649-
</exclusion>
650602
<exclusion>
651603
<groupId>org.jruby</groupId>
652604
<artifactId>jruby-complete</artifactId>
@@ -680,10 +632,6 @@
680632
<groupId>io.netty</groupId>
681633
<artifactId>netty</artifactId>
682634
</exclusion>
683-
<exclusion>
684-
<groupId>commons-logging</groupId>
685-
<artifactId>commons-logging</artifactId>
686-
</exclusion>
687635
<exclusion>
688636
<groupId>org.jruby</groupId>
689637
<artifactId>jruby-complete</artifactId>
@@ -715,10 +663,6 @@
715663
<groupId>io.netty</groupId>
716664
<artifactId>netty</artifactId>
717665
</exclusion>
718-
<exclusion>
719-
<groupId>commons-logging</groupId>
720-
<artifactId>commons-logging</artifactId>
721-
</exclusion>
722666
<exclusion>
723667
<groupId>org.jruby</groupId>
724668
<artifactId>jruby-complete</artifactId>
@@ -756,10 +700,6 @@
756700
<groupId>io.netty</groupId>
757701
<artifactId>netty</artifactId>
758702
</exclusion>
759-
<exclusion>
760-
<groupId>commons-logging</groupId>
761-
<artifactId>commons-logging</artifactId>
762-
</exclusion>
763703
<exclusion>
764704
<groupId>org.jruby</groupId>
765705
<artifactId>jruby-complete</artifactId>
@@ -808,10 +748,6 @@
808748
<groupId>io.netty</groupId>
809749
<artifactId>netty</artifactId>
810750
</exclusion>
811-
<exclusion>
812-
<groupId>commons-logging</groupId>
813-
<artifactId>commons-logging</artifactId>
814-
</exclusion>
815751
<exclusion>
816752
<groupId>org.jruby</groupId>
817753
<artifactId>jruby-complete</artifactId>
@@ -843,10 +779,6 @@
843779
<groupId>io.netty</groupId>
844780
<artifactId>netty</artifactId>
845781
</exclusion>
846-
<exclusion>
847-
<groupId>commons-logging</groupId>
848-
<artifactId>commons-logging</artifactId>
849-
</exclusion>
850782
<exclusion>
851783
<groupId>org.jruby</groupId>
852784
<artifactId>jruby-complete</artifactId>
@@ -880,10 +812,6 @@
880812
<groupId>io.netty</groupId>
881813
<artifactId>netty</artifactId>
882814
</exclusion>
883-
<exclusion>
884-
<groupId>commons-logging</groupId>
885-
<artifactId>commons-logging</artifactId>
886-
</exclusion>
887815
<exclusion>
888816
<groupId>org.jruby</groupId>
889817
<artifactId>jruby-complete</artifactId>
@@ -915,10 +843,6 @@
915843
<groupId>io.netty</groupId>
916844
<artifactId>netty</artifactId>
917845
</exclusion>
918-
<exclusion>
919-
<groupId>commons-logging</groupId>
920-
<artifactId>commons-logging</artifactId>
921-
</exclusion>
922846
<exclusion>
923847
<groupId>org.jruby</groupId>
924848
<artifactId>jruby-complete</artifactId>
@@ -956,10 +880,6 @@
956880
<groupId>io.netty</groupId>
957881
<artifactId>netty</artifactId>
958882
</exclusion>
959-
<exclusion>
960-
<groupId>commons-logging</groupId>
961-
<artifactId>commons-logging</artifactId>
962-
</exclusion>
963883
<exclusion>
964884
<groupId>org.jruby</groupId>
965885
<artifactId>jruby-complete</artifactId>
@@ -1011,10 +931,6 @@
1011931
<groupId>io.netty</groupId>
1012932
<artifactId>netty</artifactId>
1013933
</exclusion>
1014-
<exclusion>
1015-
<groupId>commons-logging</groupId>
1016-
<artifactId>commons-logging</artifactId>
1017-
</exclusion>
1018934
<exclusion>
1019935
<groupId>org.jruby</groupId>
1020936
<artifactId>jruby-complete</artifactId>
@@ -1046,10 +962,6 @@
1046962
<groupId>io.netty</groupId>
1047963
<artifactId>netty</artifactId>
1048964
</exclusion>
1049-
<exclusion>
1050-
<groupId>commons-logging</groupId>
1051-
<artifactId>commons-logging</artifactId>
1052-
</exclusion>
1053965
<exclusion>
1054966
<groupId>org.jruby</groupId>
1055967
<artifactId>jruby-complete</artifactId>
@@ -1083,10 +995,6 @@
1083995
<groupId>io.netty</groupId>
1084996
<artifactId>netty</artifactId>
1085997
</exclusion>
1086-
<exclusion>
1087-
<groupId>commons-logging</groupId>
1088-
<artifactId>commons-logging</artifactId>
1089-
</exclusion>
1090998
<exclusion>
1091999
<groupId>org.jruby</groupId>
10921000
<artifactId>jruby-complete</artifactId>
@@ -1118,10 +1026,6 @@
11181026
<groupId>io.netty</groupId>
11191027
<artifactId>netty</artifactId>
11201028
</exclusion>
1121-
<exclusion>
1122-
<groupId>commons-logging</groupId>
1123-
<artifactId>commons-logging</artifactId>
1124-
</exclusion>
11251029
<exclusion>
11261030
<groupId>org.jruby</groupId>
11271031
<artifactId>jruby-complete</artifactId>
@@ -1159,10 +1063,6 @@
11591063
<groupId>io.netty</groupId>
11601064
<artifactId>netty</artifactId>
11611065
</exclusion>
1162-
<exclusion>
1163-
<groupId>commons-logging</groupId>
1164-
<artifactId>commons-logging</artifactId>
1165-
</exclusion>
11661066
<exclusion>
11671067
<groupId>org.jruby</groupId>
11681068
<artifactId>jruby-complete</artifactId>

‎src/main/scala/org/apache/spark/sql/hbase/CheckDirEndPointImpl.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ class CheckDirEndPointImpl
4242
extends CheckDirProtos.CheckDirService with Coprocessor with CoprocessorService {
4343

4444
private lazy val logger = Logger.getLogger(getClass.getName)
45-
private var env: RegionCoprocessorEnvironment = null
4645

4746
override def start(env: CoprocessorEnvironment) = {
4847
env match {

0 commit comments

Comments
 (0)