Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

conversion to avro 1.5

  • Loading branch information...
commit f92ea015befeaaf0f60832040d37f37bc0875d9d 1 parent 81b7e68
Sam Pullara authored
2  avrobase/pom.xml
View
@@ -4,7 +4,7 @@
<parent>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>all</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</parent>
<artifactId>base</artifactId>
5 avrobase/src/main/java/avrobase/AvroBaseImpl.java
View
@@ -184,11 +184,10 @@ protected String createSchemaKey(Schema schema, String doc) {
break;
case BINARY:
default:
- d = decoderFactory.binaryDecoder(data, null);
+ d = decoderFactory.binaryDecoder(data, offset, length, null);
break;
}
- SpecificDatumReader<T> sdr = new SpecificDatumReader<T>(actualSchema);
- sdr.setExpected(schema);
+ SpecificDatumReader<T> sdr = new SpecificDatumReader<T>(schema, actualSchema);
return sdr.read(null, d);
} catch (IOException e) {
throw new AvroBaseException("Failed to read value: " + schema, e);
4 file/pom.xml
View
@@ -3,7 +3,7 @@
<parent>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>all</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@
<dependency>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>sharded</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</dependency>
<!-- Testing -->
4 handlersocket/pom.xml
View
@@ -3,7 +3,7 @@
<parent>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>all</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@
<dependency>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>mysql</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</dependency>
<!-- HandlerSocket -->
8 hbase/pom.xml
View
@@ -4,7 +4,7 @@
<parent>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>all</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</parent>
<artifactId>hbase</artifactId>
<packaging>jar</packaging>
@@ -28,7 +28,7 @@
<dependency>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>solr</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</dependency>
<!-- HBase -->
@@ -38,6 +38,10 @@
<version>0.90.0</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</exclusion>
4 memcached/pom.xml
View
@@ -5,7 +5,7 @@
<parent>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>all</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</parent>
<artifactId>memcached</artifactId>
@@ -36,7 +36,7 @@
<dependency>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>base</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</dependency>
</dependencies>
4 mysql/pom.xml
View
@@ -5,7 +5,7 @@
<parent>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>all</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</parent>
<artifactId>mysql</artifactId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>base</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</dependency>
<!-- Test -->
1  mysql/src/main/java/avrobase/mysql/MysqlAB.java
View
@@ -360,7 +360,6 @@ public void setup(PreparedStatement ps) throws AvroBaseException, SQLException {
public Schema execute(ResultSet rs) throws AvroBaseException, SQLException {
if (rs.next()) {
- String hash = new String(rs.getBytes(2));
return loadSchema(schema_id, rs.getBytes(3));
} else {
return null;
10 pom.xml
View
@@ -9,7 +9,7 @@
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>all</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
<modules>
<module>avrobase</module>
<module>solr</module>
@@ -38,14 +38,6 @@
<id>www.javarants.com</id>
<url>scp://www.javarants.com/opt/sites/javarants/sites/</url>
</site>
- <repository>
- <id>sonatype-nexus-staging</id>
- <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>sonatype-nexus-snapshots</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
</distributionManagement>
<dependencies>
4 redis/pom.xml
View
@@ -3,7 +3,7 @@
<parent>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>all</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@
<dependency>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>base</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</dependency>
<!-- Jedis -->
6 sharded/pom.xml
View
@@ -3,7 +3,7 @@
<parent>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>all</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@
<dependency>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>base</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</dependency>
<!-- The Pusher -->
@@ -43,7 +43,7 @@
<dependency>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>mysql</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
4 solr/pom.xml
View
@@ -3,7 +3,7 @@
<parent>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>all</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@
<dependency>
<groupId>com.github.spullara.avrobase</groupId>
<artifactId>base</artifactId>
- <version>${avrobase.version}</version>
+ <version>0.2-SNAPSHOT</version>
</dependency>
<!-- Solr -->
Please sign in to comment.
Something went wrong with that request. Please try again.