Skip to content

Commit fe6a870

Browse files
author
phoebe
committed
update maven and upgrade to solr5.5.4
1 parent 1301775 commit fe6a870

40 files changed

+158
-14
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.DS_Store
22
.idea/
3+
target/
34
solrhbasedataimporter.iml

‎lib/solr-dataimporthandler-5.5.3.jar

-221 KB
Binary file not shown.

‎pom.xml

+24-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,18 @@
66

77
<groupId>bebe.solr</groupId>
88
<artifactId>solr-hbase-dataimporter</artifactId>
9-
<version>5.5.3</version>
9+
<version>5.5.4</version>
10+
11+
<properties>
12+
<lucene.version>5.5.4</lucene.version>
13+
<cdh.version>1.2.0-cdh5.9.0</cdh.version>
14+
</properties>
1015

1116
<dependencies>
1217
<dependency>
1318
<groupId>org.apache.solr</groupId>
1419
<artifactId>solr-dataimporthandler</artifactId>
15-
<version>5.5.3</version>
20+
<version>${lucene.version}</version>
1621
</dependency>
1722
<dependency>
1823
<groupId>org.slf4j</groupId>
@@ -27,12 +32,23 @@
2732
<dependency>
2833
<groupId>org.apache.hbase</groupId>
2934
<artifactId>hbase-client</artifactId>
30-
<version>1.2.0-cdh5.9.0</version>
35+
<version>${cdh.version}</version>
3136
</dependency>
3237
<dependency>
3338
<groupId>org.apache.hbase</groupId>
3439
<artifactId>hbase-common</artifactId>
35-
<version>1.2.0-cdh5.9.0</version>
40+
<version>${cdh.version}</version>
41+
</dependency>
42+
<dependency>
43+
<groupId>junit</groupId>
44+
<artifactId>junit</artifactId>
45+
<version>4.8</version>
46+
<scope>test</scope>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.mockito</groupId>
50+
<artifactId>mockito-core</artifactId>
51+
<version>1.9.5</version>
3652
</dependency>
3753
</dependencies>
3854

@@ -45,6 +61,10 @@
4561
<artifactId>maven-compiler-plugin</artifactId>
4662
<version>3.1</version>
4763
<inherited>true</inherited>
64+
<configuration>
65+
<source>1.7</source>
66+
<target>1.7</target>
67+
</configuration>
4868
</plugin>
4969
<!-- maven-dependency-plugin -->
5070
<plugin>

‎solr-hbase-dataimporter.iml

+118
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
9+
<excludeFolder url="file://$MODULE_DIR$/target" />
10+
</content>
11+
<orderEntry type="inheritedJdk" />
12+
<orderEntry type="sourceFolder" forTests="false" />
13+
<orderEntry type="library" name="Maven: org.apache.solr:solr-dataimporthandler:5.5.4" level="project" />
14+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:5.5.4" level="project" />
15+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-kuromoji:5.5.4" level="project" />
16+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-phonetic:5.5.4" level="project" />
17+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:5.5.4" level="project" />
18+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-codecs:5.5.4" level="project" />
19+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:5.5.4" level="project" />
20+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-expressions:5.5.4" level="project" />
21+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:5.5.4" level="project" />
22+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:5.5.4" level="project" />
23+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:5.5.4" level="project" />
24+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:5.5.4" level="project" />
25+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:5.5.4" level="project" />
26+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:5.5.4" level="project" />
27+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:5.5.4" level="project" />
28+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:5.5.4" level="project" />
29+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial:5.5.4" level="project" />
30+
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:5.5.4" level="project" />
31+
<orderEntry type="library" name="Maven: org.apache.solr:solr-core:5.5.4" level="project" />
32+
<orderEntry type="library" name="Maven: org.apache.solr:solr-solrj:5.5.4" level="project" />
33+
<orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.7.1" level="project" />
34+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.5.4" level="project" />
35+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.5.4" level="project" />
36+
<orderEntry type="library" name="Maven: com.google.guava:guava:14.0.1" level="project" />
37+
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.5.0" level="project" />
38+
<orderEntry type="library" name="Maven: com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.2" level="project" />
39+
<orderEntry type="library" name="Maven: com.spatial4j:spatial4j:0.5" level="project" />
40+
<orderEntry type="library" name="Maven: com.tdunning:t-digest:3.1" level="project" />
41+
<orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
42+
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
43+
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
44+
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.6" level="project" />
45+
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.2" level="project" />
46+
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
47+
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
48+
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
49+
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
50+
<orderEntry type="library" name="Maven: joda-time:joda-time:2.2" level="project" />
51+
<orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
52+
<orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.5.1-1" level="project" />
53+
<orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.3" level="project" />
54+
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-annotations:2.6.0" level="project" />
55+
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-auth:2.6.0" level="project" />
56+
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-common:2.6.0" level="project" />
57+
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-hdfs:2.6.0" level="project" />
58+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.4.1" level="project" />
59+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.1" level="project" />
60+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.4.1" level="project" />
61+
<orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
62+
<orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
63+
<orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" level="project" />
64+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-continuation:9.2.13.v20150730" level="project" />
65+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-deploy:9.2.13.v20150730" level="project" />
66+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.2.13.v20150730" level="project" />
67+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.2.13.v20150730" level="project" />
68+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-jmx:9.2.13.v20150730" level="project" />
69+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-rewrite:9.2.13.v20150730" level="project" />
70+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.2.13.v20150730" level="project" />
71+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.2.13.v20150730" level="project" />
72+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.2.13.v20150730" level="project" />
73+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlets:9.2.13.v20150730" level="project" />
74+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.2.13.v20150730" level="project" />
75+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.2.13.v20150730" level="project" />
76+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.2.13.v20150730" level="project" />
77+
<orderEntry type="library" name="Maven: org.htrace:htrace-core:3.0.4" level="project" />
78+
<orderEntry type="library" name="Maven: org.noggit:noggit:0.6" level="project" />
79+
<orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
80+
<orderEntry type="library" name="Maven: org.ow2.asm:asm-commons:5.0.4" level="project" />
81+
<orderEntry type="library" name="Maven: org.restlet.jee:org.restlet:2.3.0" level="project" />
82+
<orderEntry type="library" name="Maven: org.restlet.jee:org.restlet.ext.servlet:2.3.0" level="project" />
83+
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.7" level="project" />
84+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
85+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.5" level="project" />
86+
<orderEntry type="library" name="Maven: org.apache.hbase:hbase-client:1.2.0-cdh5.9.0" level="project" />
87+
<orderEntry type="library" name="Maven: org.apache.hbase:hbase-annotations:1.2.0-cdh5.9.0" level="project" />
88+
<orderEntry type="library" name="Maven: org.apache.hbase:hbase-protocol:1.2.0-cdh5.9.0" level="project" />
89+
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
90+
<orderEntry type="library" name="Maven: io.netty:netty-all:4.0.23.Final" level="project" />
91+
<orderEntry type="library" name="Maven: org.apache.htrace:htrace-core:3.2.0-incubating" level="project" />
92+
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.8.8" level="project" />
93+
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.8.8" level="project" />
94+
<orderEntry type="library" name="Maven: org.jruby.jcodings:jcodings:1.0.8" level="project" />
95+
<orderEntry type="library" name="Maven: org.jruby.joni:joni:2.1.2" level="project" />
96+
<orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.2.0" level="project" />
97+
<orderEntry type="library" name="Maven: com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1" level="project" />
98+
<orderEntry type="library" name="Maven: org.apache.hbase:hbase-common:1.2.0-cdh5.9.0" level="project" />
99+
<orderEntry type="library" name="Maven: org.mortbay.jetty:jetty-util:6.1.26.cloudera.4" level="project" />
100+
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-core:2.6.0-mr1-cdh5.9.0" level="project" />
101+
<orderEntry type="library" name="Maven: xmlenc:xmlenc:0.52" level="project" />
102+
<orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
103+
<orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
104+
<orderEntry type="library" name="Maven: org.mortbay.jetty:jetty:6.1.26.cloudera.2" level="project" />
105+
<orderEntry type="library" name="Maven: tomcat:jasper-runtime:5.5.23" level="project" />
106+
<orderEntry type="library" name="Maven: tomcat:jasper-compiler:5.5.23" level="project" />
107+
<orderEntry type="library" name="Maven: javax.servlet.jsp:jsp-api:2.1" level="project" />
108+
<orderEntry type="library" name="Maven: commons-el:commons-el:1.0" level="project" />
109+
<orderEntry type="library" name="Maven: net.java.dev.jets3t:jets3t:0.6.1" level="project" />
110+
<orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
111+
<orderEntry type="library" name="Maven: hsqldb:hsqldb:1.8.0.10" level="project" />
112+
<orderEntry type="library" name="Maven: org.eclipse.jdt:core:3.1.1" level="project" />
113+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8" level="project" />
114+
<orderEntry type="library" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
115+
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
116+
<orderEntry type="library" name="Maven: org.objenesis:objenesis:1.0" level="project" />
117+
</component>
118+
</module>

‎src/main/java/org/apache/solr/handler/dataimport/HBaseEntityProcessor.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* Created by phoebe.shih on 2017/5/13.
88
*/
9-
public class HBaseEntityProcessor extends EntityProcessorBase{
9+
public class HBaseEntityProcessor extends SqlEntityProcessor{
1010

1111
protected DataSource<Iterator<Map<String, Object>>> dataSource;
1212

@@ -23,4 +23,9 @@ public Map<String, Object> nextRow() {
2323
}
2424
return getNext();
2525
}
26+
27+
@Override
28+
public void destroy(){
29+
dataSource.close();
30+
}
2631
}

‎target/classes/org/apache/solr/handler/dataimport/DataImportException.class

0 Bytes
Binary file not shown.

‎target/classes/org/apache/solr/handler/dataimport/DataType.class

32 Bytes
Binary file not shown.

‎target/classes/org/apache/solr/handler/dataimport/HBaseColumn.class

175 Bytes
Binary file not shown.

‎target/classes/org/apache/solr/handler/dataimport/HBaseDataSource.class

167 Bytes
Binary file not shown.

‎target/classes/org/apache/solr/handler/dataimport/HBaseEntityProcessor.class

120 Bytes
Binary file not shown.

‎target/classes/org/apache/solr/handler/dataimport/HBaseResultSet$1.class

0 Bytes
Binary file not shown.

‎target/classes/org/apache/solr/handler/dataimport/HBaseResultSet.class

78 Bytes
Binary file not shown.

‎target/classes/org/apache/solr/handler/dataimport/HBaseScanFactory.class

68 Bytes
Binary file not shown.

‎target/libs/commons-fileupload-1.3.1.jar

-67.4 KB
Binary file not shown.

‎target/libs/hamcrest-core-1.3.jar

-44 KB
Binary file not shown.

‎target/libs/junit-4.12.jar

-308 KB
Binary file not shown.

‎target/libs/lucene-analyzers-common-5.5.3.jar

-1.5 MB
Binary file not shown.

‎target/libs/lucene-analyzers-kuromoji-5.5.3.jar

-4.39 MB
Binary file not shown.

‎target/libs/lucene-analyzers-phonetic-5.5.3.jar

-25.6 KB
Binary file not shown.

‎target/libs/lucene-backward-codecs-5.5.3.jar

-421 KB
Binary file not shown.

‎target/libs/lucene-codecs-5.5.3.jar

-409 KB
Binary file not shown.

‎target/libs/lucene-core-5.5.3.jar

-2.26 MB
Binary file not shown.

‎target/libs/lucene-expressions-5.5.3.jar

-75.2 KB
Binary file not shown.

‎target/libs/lucene-grouping-5.5.3.jar

-105 KB
Binary file not shown.

‎target/libs/lucene-highlighter-5.5.3.jar

-141 KB
Binary file not shown.

‎target/libs/lucene-join-5.5.3.jar

-133 KB
Binary file not shown.

‎target/libs/lucene-memory-5.5.3.jar

-33 KB
Binary file not shown.

‎target/libs/lucene-misc-5.5.3.jar

-168 KB
Binary file not shown.

‎target/libs/lucene-queries-5.5.3.jar

-246 KB
Binary file not shown.

‎target/libs/lucene-queryparser-5.5.3.jar

-393 KB
Binary file not shown.

‎target/libs/lucene-sandbox-5.5.3.jar

-227 KB
Binary file not shown.

‎target/libs/lucene-spatial-5.5.3.jar

-255 KB
Binary file not shown.

‎target/libs/lucene-suggest-5.5.3.jar

-241 KB
Binary file not shown.

‎target/libs/solr-core-5.5.3.jar

-3.71 MB
Binary file not shown.

‎target/libs/solr-dataimporthandler-5.5.3.jar

-221 KB
Binary file not shown.

‎target/libs/solr-solrj-5.5.3.jar

-677 KB
Binary file not shown.

‎target/maven-archiver/pom.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Generated by Maven
2-
#Sat May 13 17:51:36 CST 2017
3-
version=5.5.3
2+
#Sat Aug 26 12:06:28 CST 2017
3+
version=5.5.4
44
groupId=bebe.solr
55
artifactId=solr-hbase-dataimporter

‎target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/Users/phoebe.shih/Documents/study/bebe/solrhbasedataimporter/src/main/java/org/apache/solr/handler/dataimport/DataImportException.java
2-
/Users/phoebe.shih/Documents/study/bebe/solrhbasedataimporter/src/main/java/org/apache/solr/handler/dataimport/HBaseScanFactory.java
3-
/Users/phoebe.shih/Documents/study/bebe/solrhbasedataimporter/src/main/java/org/apache/solr/handler/dataimport/DataType.java
4-
/Users/phoebe.shih/Documents/study/bebe/solrhbasedataimporter/src/main/java/org/apache/solr/handler/dataimport/HBaseEntityProcessor.java
5-
/Users/phoebe.shih/Documents/study/bebe/solrhbasedataimporter/src/main/java/org/apache/solr/handler/dataimport/HBaseColumn.java
6-
/Users/phoebe.shih/Documents/study/bebe/solrhbasedataimporter/src/main/java/org/apache/solr/handler/dataimport/HBaseDataSource.java
7-
/Users/phoebe.shih/Documents/study/bebe/solrhbasedataimporter/src/main/java/org/apache/solr/handler/dataimport/HBaseResultSet.java
1+
/Users/phoebe.shih/Documents/study/git/solr-hbase-dataimporter/src/main/java/org/apache/solr/handler/dataimport/HBaseColumn.java
2+
/Users/phoebe.shih/Documents/study/git/solr-hbase-dataimporter/src/main/java/org/apache/solr/handler/dataimport/DataType.java
3+
/Users/phoebe.shih/Documents/study/git/solr-hbase-dataimporter/src/main/java/org/apache/solr/handler/dataimport/HBaseDataSource.java
4+
/Users/phoebe.shih/Documents/study/git/solr-hbase-dataimporter/src/main/java/org/apache/solr/handler/dataimport/HBaseScanFactory.java
5+
/Users/phoebe.shih/Documents/study/git/solr-hbase-dataimporter/src/main/java/org/apache/solr/handler/dataimport/HBaseEntityProcessor.java
6+
/Users/phoebe.shih/Documents/study/git/solr-hbase-dataimporter/src/main/java/org/apache/solr/handler/dataimport/DataImportException.java
7+
/Users/phoebe.shih/Documents/study/git/solr-hbase-dataimporter/src/main/java/org/apache/solr/handler/dataimport/HBaseResultSet.java

‎target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

Whitespace-only changes.

‎target/solr-hbase-dataimporter-5.5.3.jar

-14.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)