Skip to content

Commit 8bddb96

Browse files
yzhou2001yzhou2001
committed
revert back to long-running HBaseSQLContext used in tests
1 parent 065d974 commit 8bddb96

19 files changed

+835
-653
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class HBasePartitioner (var splitKeys: Array[HBaseRawType]) extends Partitioner
4141

4242
def numPartitions = if (len == 0) 1 else len
4343

44-
@transient private val binarySearch: ((Array[t], t) => Int) = CollectionsUtils.makeBinarySearch[t]
44+
@transient private lazy val binarySearch: ((Array[t], t) => Int) = CollectionsUtils.makeBinarySearch[t]
4545

4646
def getPartition(key: Any): Int = {
4747
val k = key.asInstanceOf[t]

‎src/test/resources/131_regions.txt

Lines changed: 260 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,260 @@
1+
1,0
2+
2,0
3+
3,0
4+
4,0
5+
5,0
6+
6,0
7+
7,0
8+
8,0
9+
9,0
10+
10,0
11+
11,0
12+
12,0
13+
13,0
14+
14,0
15+
15,0
16+
16,0
17+
17,0
18+
18,0
19+
19,0
20+
20,0
21+
21,0
22+
22,0
23+
23,0
24+
24,0
25+
25,0
26+
26,0
27+
27,0
28+
28,0
29+
29,0
30+
30,0
31+
31,0
32+
32,0
33+
33,0
34+
34,0
35+
35,0
36+
36,0
37+
37,0
38+
38,0
39+
39,0
40+
40,0
41+
41,0
42+
42,0
43+
43,0
44+
44,0
45+
45,0
46+
46,0
47+
47,0
48+
48,0
49+
49,0
50+
50,0
51+
51,0
52+
52,0
53+
53,0
54+
54,0
55+
55,0
56+
56,0
57+
57,0
58+
58,0
59+
59,0
60+
60,0
61+
61,0
62+
62,0
63+
63,0
64+
64,0
65+
65,0
66+
66,0
67+
67,0
68+
68,0
69+
69,0
70+
70,0
71+
71,0
72+
72,0
73+
73,0
74+
74,0
75+
75,0
76+
76,0
77+
77,0
78+
78,0
79+
79,0
80+
80,0
81+
81,0
82+
82,0
83+
83,0
84+
84,0
85+
85,0
86+
86,0
87+
87,0
88+
88,0
89+
89,0
90+
90,0
91+
91,0
92+
92,0
93+
93,0
94+
94,0
95+
95,0
96+
96,0
97+
97,0
98+
98,0
99+
99,0
100+
100,0
101+
101,0
102+
102,0
103+
103,0
104+
104,0
105+
105,0
106+
106,0
107+
107,0
108+
108,0
109+
109,0
110+
110,0
111+
111,0
112+
112,0
113+
113,0
114+
114,0
115+
115,0
116+
116,0
117+
117,0
118+
118,0
119+
119,0
120+
120,0
121+
121,0
122+
122,0
123+
123,0
124+
124,0
125+
125,0
126+
126,0
127+
127,0
128+
128,0
129+
129,0
130+
130,0
131+
131,0
132+
132,0
133+
133,0
134+
134,0
135+
135,0
136+
136,0
137+
137,0
138+
138,0
139+
139,0
140+
140,0
141+
141,0
142+
142,0
143+
143,0
144+
144,0
145+
145,0
146+
146,0
147+
147,0
148+
148,0
149+
149,0
150+
150,0
151+
151,0
152+
152,0
153+
153,0
154+
154,0
155+
155,0
156+
156,0
157+
157,0
158+
158,0
159+
159,0
160+
160,0
161+
161,0
162+
162,0
163+
163,0
164+
164,0
165+
165,0
166+
166,0
167+
167,0
168+
168,0
169+
169,0
170+
170,0
171+
171,0
172+
172,0
173+
173,0
174+
174,0
175+
175,0
176+
176,0
177+
177,0
178+
178,0
179+
179,0
180+
180,0
181+
181,0
182+
182,0
183+
183,0
184+
184,0
185+
185,0
186+
186,0
187+
187,0
188+
188,0
189+
189,0
190+
190,0
191+
191,0
192+
192,0
193+
193,0
194+
194,0
195+
195,0
196+
196,0
197+
197,0
198+
198,0
199+
199,0
200+
200,0
201+
201,0
202+
202,0
203+
203,0
204+
204,0
205+
205,0
206+
206,0
207+
207,0
208+
208,0
209+
209,0
210+
210,0
211+
211,0
212+
212,0
213+
213,0
214+
214,0
215+
215,0
216+
216,0
217+
217,0
218+
218,0
219+
219,0
220+
220,0
221+
221,0
222+
222,0
223+
223,0
224+
224,0
225+
225,0
226+
226,0
227+
227,0
228+
228,0
229+
229,0
230+
230,0
231+
231,0
232+
232,0
233+
233,0
234+
234,0
235+
235,0
236+
236,0
237+
237,0
238+
238,0
239+
239,0
240+
240,0
241+
241,0
242+
242,0
243+
243,0
244+
244,0
245+
245,0
246+
246,0
247+
247,0
248+
248,0
249+
249,0
250+
250,0
251+
251,0
252+
252,0
253+
253,0
254+
254,0
255+
255,0
256+
256,0
257+
257,0
258+
258,0
259+
259,0
260+
260,0

‎src/test/scala/org/apache/spark/sql/hbase/CriticalPointsTestSuite.scala

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,12 @@ import scala.collection.mutable.ArrayBuffer
2626

2727
//@Ignore
2828
class CriticalPointsTestSuite extends FunSuite with BeforeAndAfterAll with Logging {
29-
val namespace = "default"
29+
val namespace = "testNamespace"
3030
val tableName = "testTable"
3131
val hbaseTableName = "ht"
3232
val family1 = "family1"
3333
val family2 = "family2"
3434

35-
override protected def beforeAll() = {
36-
super.beforeAll()
37-
TestHbase.start
38-
}
39-
40-
override protected def afterAll() = {
41-
TestHbase.stop
42-
super.afterAll()
43-
}
44-
4535
def partitionEquals(p1: HBasePartition, p2: HBasePartition): Boolean = {
4636
((p1.start equals p2.start)
4737
&& (p1.startInclusive equals p2.startInclusive)
@@ -54,7 +44,7 @@ class CriticalPointsTestSuite extends FunSuite with BeforeAndAfterAll with Loggi
5444
allColumns = allColumns :+ KeyColumn("column1", IntegerType, 0)
5545
allColumns = allColumns :+ NonKeyColumn("column2", BooleanType, family1, "qualifier1")
5646
val relation = HBaseRelation(tableName, namespace,
57-
hbaseTableName, allColumns, Some(true))(TestHbase.hsc)
47+
hbaseTableName, allColumns, Some(true))(TestHbase)
5848

5949
val lll = relation.output.find(_.name == "column1").get
6050
val llr = Literal.create(1023, IntegerType)
@@ -96,7 +86,7 @@ class CriticalPointsTestSuite extends FunSuite with BeforeAndAfterAll with Loggi
9686
allColumns = allColumns :+ NonKeyColumn("column2", BooleanType, family1, "qualifier1")
9787

9888
val relation = HBaseRelation(tableName, namespace, hbaseTableName,
99-
allColumns, Some(true))(TestHbase.hsc)
89+
allColumns, Some(true))(TestHbase)
10090

10191
val lll = relation.output.find(_.name == "column1").get
10292
val llr = Literal.create(1023L, LongType)
@@ -133,7 +123,7 @@ class CriticalPointsTestSuite extends FunSuite with BeforeAndAfterAll with Loggi
133123
allColumns = allColumns :+ NonKeyColumn("column2", BooleanType, family1, "qualifier1")
134124

135125
val relation = HBaseRelation(tableName, namespace, hbaseTableName,
136-
allColumns, Some(true))(TestHbase.hsc)
126+
allColumns, Some(true))(TestHbase)
137127

138128
val lll = relation.output.find(_.name == "column1").get
139129
val llr = Literal.create("aaa", StringType)
@@ -168,7 +158,7 @@ class CriticalPointsTestSuite extends FunSuite with BeforeAndAfterAll with Loggi
168158
allColumns = allColumns :+ NonKeyColumn("column5", BooleanType, family1, "qualifier1")
169159

170160
val relation = HBaseRelation(tableName, namespace, hbaseTableName,
171-
allColumns, Some(true))(TestHbase.hsc)
161+
allColumns, Some(true))(TestHbase)
172162

173163
val lll = relation.output.find(_.name == "column3").get
174164
val llr = Literal.create(8.toShort, ShortType)
@@ -230,7 +220,7 @@ class CriticalPointsTestSuite extends FunSuite with BeforeAndAfterAll with Loggi
230220
allColumns = allColumns :+ NonKeyColumn("column5", BooleanType, family1, "qualifier1")
231221

232222
val relation = HBaseRelation(tableName, namespace, hbaseTableName,
233-
allColumns, Some(true))(TestHbase.hsc)
223+
allColumns, Some(true))(TestHbase)
234224

235225
val lll = relation.output.find(_.name == "column2").get
236226
val llr = Literal.create(8, IntegerType)
@@ -296,7 +286,7 @@ class CriticalPointsTestSuite extends FunSuite with BeforeAndAfterAll with Loggi
296286
allColumns = allColumns :+ NonKeyColumn("column4", BooleanType, family1, "qualifier1")
297287

298288
val relation = HBaseRelation(tableName, namespace, hbaseTableName,
299-
allColumns, Some(true))(TestHbase.hsc)
289+
allColumns, Some(true))(TestHbase)
300290

301291
val lll = relation.output.find(_.name == "column2").get
302292
val llr = Literal.create(8, IntegerType)
@@ -377,7 +367,7 @@ class CriticalPointsTestSuite extends FunSuite with BeforeAndAfterAll with Loggi
377367
allColumns = allColumns :+ NonKeyColumn("column4", BooleanType, family1, "qualifier1")
378368

379369
val relation = HBaseRelation(tableName, namespace, hbaseTableName,
380-
allColumns, Some(true))(TestHbase.hsc)
370+
allColumns, Some(true))(TestHbase)
381371

382372
val lll = relation.output.find(_.name == "column2").get
383373
val llr = Literal.create(8, IntegerType)
@@ -469,7 +459,7 @@ class CriticalPointsTestSuite extends FunSuite with BeforeAndAfterAll with Loggi
469459
allColumns = allColumns :+ NonKeyColumn("column4", BooleanType, family1, "qualifier1")
470460

471461
val relation = HBaseRelation(tableName, namespace, hbaseTableName,
472-
allColumns, Some(true))(TestHbase.hsc)
462+
allColumns, Some(true))(TestHbase)
473463

474464
val lll = relation.output.find(_.name == "column2").get
475465
val llr = Literal.create(8, IntegerType)
@@ -560,7 +550,7 @@ class CriticalPointsTestSuite extends FunSuite with BeforeAndAfterAll with Loggi
560550
allColumns = allColumns :+ NonKeyColumn("column5", BooleanType, family1, "qualifier1")
561551

562552
val relation = HBaseRelation(tableName, namespace, hbaseTableName,
563-
allColumns, Some(true))(TestHbase.hsc)
553+
allColumns, Some(true))(TestHbase)
564554

565555
val lll = relation.output.find(_.name == "column3").get
566556
val llr = Literal.create(32, IntegerType)

0 commit comments

Comments
 (0)