Skip to content

Commit e5a4232

Browse files
kai33kai33
authored
Fix scanner (#1)
* check in pom.xml * remove unnecessary plugins * remove unnecessary parent pom * apply patch OpenTSDB#202
1 parent 000f421 commit e5a4232

File tree

4 files changed

+298
-2
lines changed

4 files changed

+298
-2
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
build/
2-
pom.xml
32
target/
43
/bin/
54
.idea

‎pom.xml

+296
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,296 @@
1+
<!-- Generated by Makefile on Wed May 15 21:25:11 +08 2019 -->
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<groupId>org.hbase</groupId>
8+
<artifactId>asynchbase</artifactId>
9+
<version>1.8.3-SNAPSHOT</version>
10+
<name>Asynchronous HBase Client</name>
11+
<organization>
12+
<name>The Async HBase Authors</name>
13+
<url>http://opentsdb.net</url>
14+
</organization>
15+
<description>
16+
An alternative HBase client library for applications requiring fully
17+
asynchronous, non-blocking and thread-safe HBase connectivity.
18+
</description>
19+
<url>https://github.com/OpenTSDB/asynchbase</url>
20+
<licenses>
21+
<license>
22+
<name>BSD</name>
23+
<url>http://www.opensource.org/licenses/BSD-3-Clause</url>
24+
<distribution>repo</distribution>
25+
</license>
26+
</licenses>
27+
<scm>
28+
<connection>scm:git:[email protected]:OpenTSDB/asynchbase.git</connection>
29+
<url>https://github.com/OpenTSDB/asynchbase</url>
30+
</scm>
31+
<issueManagement>
32+
<system>GitHub</system>
33+
<url>https://github.com/OpenTSDB/asynchbase/issues</url>
34+
</issueManagement>
35+
<mailingLists>
36+
<mailingList>
37+
<name>User List</name>
38+
<post>[email protected]</post>
39+
<subscribe>[email protected]</subscribe>
40+
<unsubscribe>[email protected]</unsubscribe>
41+
<archive>https://groups.google.com/group/asynchbase</archive>
42+
</mailingList>
43+
</mailingLists>
44+
<developers>
45+
<developer>
46+
<id>tsuna</id>
47+
<name>Benoit "tsuna" Sigoure</name>
48+
<email>[email protected]</email>
49+
<roles>
50+
<role>developer</role>
51+
</roles>
52+
<timezone>-8</timezone>
53+
</developer>
54+
</developers>
55+
<inceptionYear>2010</inceptionYear>
56+
57+
<packaging>jar</packaging>
58+
59+
<build>
60+
<sourceDirectory>.mvn-compat/src/main/java</sourceDirectory>
61+
<testSourceDirectory>test</testSourceDirectory>
62+
63+
<plugins>
64+
65+
<plugin>
66+
<groupId>org.xolstice.maven.plugins</groupId>
67+
<artifactId>protobuf-maven-plugin</artifactId>
68+
<version>0.5.0</version>
69+
<configuration>
70+
<protocExecutable>protoc</protocExecutable>
71+
<protoSourceRoot>${basedir}/protobuf</protoSourceRoot>
72+
</configuration>
73+
<executions>
74+
<execution>
75+
<goals>
76+
<goal>compile</goal>
77+
</goals>
78+
</execution>
79+
</executions>
80+
</plugin>
81+
82+
<plugin>
83+
<groupId>org.apache.maven.plugins</groupId>
84+
<artifactId>maven-compiler-plugin</artifactId>
85+
<version>2.5.1</version>
86+
<configuration>
87+
<source>1.6</source>
88+
<target>1.6</target>
89+
<compilerArgument>-Xlint</compilerArgument>
90+
</configuration>
91+
</plugin>
92+
93+
<plugin>
94+
<groupId>org.apache.maven.plugins</groupId>
95+
<artifactId>maven-source-plugin</artifactId>
96+
<version>2.2.1</version>
97+
<executions>
98+
<execution>
99+
<id>attach-sources</id>
100+
<goals>
101+
<goal>jar</goal>
102+
</goals>
103+
</execution>
104+
</executions>
105+
</plugin>
106+
107+
<plugin>
108+
<groupId>org.apache.maven.plugins</groupId>
109+
<artifactId>maven-surefire-plugin</artifactId>
110+
<version>2.12.4</version>
111+
<configuration>
112+
<excludes>
113+
<exclude>**/TestIntegration.java</exclude>
114+
<exclude>**/TestIncrementCoalescing.java</exclude>
115+
</excludes>
116+
</configuration>
117+
</plugin>
118+
119+
</plugins>
120+
</build>
121+
122+
<profiles>
123+
<!-- CGlib in Mockito and PowerMockito has issues mocking the Subject class under javax.security.auth.
124+
It should work better in 2.x so until that comes out, we'll just skip the auth test classes when running
125+
under JDK 8.
126+
127+
The exception observed is:
128+
java.lang.LinkageError: loader constraint violation in interface itable initialization:
129+
when resolving method "$java.security.Principal$$EnhancerByMockitoWithCGLIB$$e775e657
130+
.implies(Ljavax/security/auth/Subject;)Z" the class loader (instance of org/powermock/
131+
core/classloader/MockClassLoader) of the current class, $java/security/
132+
Principal$$EnhancerByMockitoWithCGLIB$$e775e657, and the class loader (instance of <bootloader>) for
133+
interface java/security/Principal have different Class objects for the type javax/security/auth/Subject
134+
used in the signature.
135+
-->
136+
<profile>
137+
<activation>
138+
<jdk>1.8</jdk>
139+
</activation>
140+
<build>
141+
<plugins>
142+
<plugin>
143+
<groupId>org.apache.maven.plugins</groupId>
144+
<artifactId>maven-surefire-plugin</artifactId>
145+
<version>2.12.4</version>
146+
<configuration>
147+
<excludes>
148+
<exclude>**/TestKerberosClientAuthProvider.java</exclude>
149+
<exclude>**/TestLogin.java</exclude>
150+
<exclude>**/TestSimpleClientAuthProvider.java</exclude>
151+
<exclude>**/TestIntegration.java</exclude>
152+
<exclude>**/TestIncrementCoalescing.java</exclude>
153+
</excludes>
154+
</configuration>
155+
</plugin>
156+
</plugins>
157+
</build>
158+
</profile>
159+
</profiles>
160+
161+
<dependencies>
162+
163+
<dependency>
164+
<groupId>com.google.guava</groupId>
165+
<artifactId>guava</artifactId>
166+
<version>18.0</version>
167+
</dependency>
168+
169+
<dependency>
170+
<groupId>com.google.protobuf</groupId>
171+
<artifactId>protobuf-java</artifactId>
172+
<version>2.5.0</version>
173+
</dependency>
174+
175+
<dependency>
176+
<groupId>io.netty</groupId>
177+
<artifactId>netty</artifactId>
178+
<version>3.9.4.Final</version>
179+
</dependency>
180+
181+
<dependency>
182+
<groupId>com.stumbleupon</groupId>
183+
<artifactId>async</artifactId>
184+
<version>1.4.0</version>
185+
</dependency>
186+
187+
<dependency>
188+
<groupId>org.apache.zookeeper</groupId>
189+
<artifactId>zookeeper</artifactId>
190+
<version>3.4.5</version>
191+
<exclusions>
192+
<exclusion>
193+
<groupId>log4j</groupId>
194+
<artifactId>log4j</artifactId>
195+
</exclusion>
196+
<exclusion>
197+
<groupId>org.slf4j</groupId>
198+
<artifactId>slf4j-log4j12</artifactId>
199+
</exclusion>
200+
<exclusion>
201+
<groupId>jline</groupId>
202+
<artifactId>jline</artifactId>
203+
</exclusion>
204+
<exclusion>
205+
<groupId>junit</groupId>
206+
<artifactId>junit</artifactId>
207+
</exclusion>
208+
</exclusions>
209+
</dependency>
210+
211+
<dependency>
212+
<groupId>org.slf4j</groupId>
213+
<artifactId>slf4j-api</artifactId>
214+
<version>1.7.7</version>
215+
</dependency>
216+
217+
<!-- runtime dependencies -->
218+
219+
<dependency>
220+
<groupId>org.slf4j</groupId>
221+
<artifactId>log4j-over-slf4j</artifactId>
222+
<version>1.7.7</version>
223+
<scope>runtime</scope>
224+
</dependency>
225+
226+
<!-- test dependencies -->
227+
228+
<dependency>
229+
<groupId>org.hamcrest</groupId>
230+
<artifactId>hamcrest-core</artifactId>
231+
<version>1.3</version>
232+
<scope>test</scope>
233+
</dependency>
234+
235+
<dependency>
236+
<groupId>junit</groupId>
237+
<artifactId>junit</artifactId>
238+
<version>4.11</version>
239+
<scope>test</scope>
240+
</dependency>
241+
242+
<dependency>
243+
<groupId>org.javassist</groupId>
244+
<artifactId>javassist</artifactId>
245+
<version>3.18.1-GA</version>
246+
<scope>test</scope>
247+
</dependency>
248+
249+
<dependency>
250+
<groupId>org.mockito</groupId>
251+
<artifactId>mockito-all</artifactId>
252+
<version>1.9.5</version>
253+
<scope>test</scope>
254+
</dependency>
255+
256+
<dependency>
257+
<groupId>org.objenesis</groupId>
258+
<artifactId>objenesis</artifactId>
259+
<version>2.1</version>
260+
<scope>test</scope>
261+
</dependency>
262+
263+
<dependency>
264+
<groupId>org.powermock</groupId>
265+
<artifactId>powermock-module-junit4</artifactId>
266+
<version>1.5.4</version>
267+
<scope>test</scope>
268+
</dependency>
269+
270+
<dependency>
271+
<groupId>org.powermock</groupId>
272+
<artifactId>powermock-api-mockito</artifactId>
273+
<version>1.5.4</version>
274+
<scope>test</scope>
275+
</dependency>
276+
277+
<dependency>
278+
<groupId>ch.qos.logback</groupId>
279+
<artifactId>logback-core</artifactId>
280+
<version>1.2.1</version>
281+
<scope>test</scope>
282+
</dependency>
283+
<dependency>
284+
<groupId>ch.qos.logback</groupId>
285+
<artifactId>logback-classic</artifactId>
286+
<version>1.2.1</version>
287+
<scope>test</scope>
288+
</dependency>
289+
290+
</dependencies>
291+
292+
<properties>
293+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
294+
</properties>
295+
296+
</project>

‎src/RegionClient.java

+1
Original file line numberDiff line numberDiff line change
@@ -1547,6 +1547,7 @@ protected Object decode(final ChannelHandlerContext ctx,
15471547
final class RetryTimer implements TimerTask {
15481548
public void run(final Timeout timeout) {
15491549
if (isAlive()) {
1550+
rpc.attempt++;
15501551
sendRpc(rpc);
15511552
} else {
15521553
if (rpc instanceof MultiAction) {

‎src/UnknownScannerException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
/**
3030
* Exception thrown when we try to use an invalid or expired scanner ID.
3131
*/
32-
public final class UnknownScannerException extends RecoverableException
32+
public final class UnknownScannerException extends NonRecoverableException
3333
implements HasFailedRpcException {
3434

3535
static final String REMOTE_CLASS =

0 commit comments

Comments
 (0)