Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'tmp'

  • Loading branch information...
commit 32fa6f5d7cd54b9048e50308bd39432b40e41f3e 2 parents d1b489f + 1f1af8a
Jenkins (CI) authored
View
8 CHANGES
@@ -6,6 +6,14 @@ as it is included in Scoorge's user's guide.
3.x
-----
+3.12.2
+~~~~~
+
+- scrooge: Added missing writeFieldEnd() for passthrough fields
+- scrooge: Bump finagle to 6.11.1
+- scrooge: Bump util to 6.11.1
+- scrooge: WriteFieldStop during transfer
+
3.12.1
~~~~~
View
3  demos/scrooge-maven-demo/pom.xml
@@ -137,7 +137,8 @@
<plugin>
<groupId>com.twitter</groupId>
<artifactId>scrooge-maven-plugin</artifactId>
- <version>3.10.2</version>
+ <!-- this version must match the version from scrooge-gen.ivy.xml -->
+ <version>3.12.1</version>
<configuration>
<thriftNamespaceMappings>
<thriftNamespaceMapping>
View
2  pom.xml
@@ -4,7 +4,7 @@
<groupId>com.twitter</groupId>
<artifactId>scrooge</artifactId>
<packaging>pom</packaging>
- <version>3.12.2-SNAPSHOT</version>
+ <version>3.12.3-SNAPSHOT</version>
<distributionManagement>
<repository>
<id>artifactory-release</id>
View
6 project/Build.scala
@@ -4,9 +4,9 @@ import com.typesafe.sbt.SbtSite.site
import com.typesafe.sbt.site.SphinxSupport.Sphinx
object Scrooge extends Build {
- val libVersion = "3.12.1"
- val utilVersion = "6.10.0"
- val finagleVersion = "6.10.0"
+ val libVersion = "3.12.2"
+ val utilVersion = "6.11.1"
+ val finagleVersion = "6.11.1"
def util(which: String) = "com.twitter" %% ("util-"+which) % utilVersion
def finagle(which: String) = "com.twitter" %% ("finagle-"+which) % finagleVersion
View
8 scrooge-benchmark/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.twitter</groupId>
<artifactId>scrooge-benchmark</artifactId>
<packaging>jar</packaging>
- <version>3.12.2-SNAPSHOT</version>
+ <version>3.12.3-SNAPSHOT</version>
<parent>
<groupId>com.twitter</groupId>
<artifactId>scala-parent-292</artifactId>
@@ -19,7 +19,7 @@
<dependency>
<groupId>com.twitter</groupId>
<artifactId>scrooge-runtime</artifactId>
- <version>3.12.2-SNAPSHOT</version>
+ <version>3.12.3-SNAPSHOT</version>
</dependency>
<!-- library dependencies -->
<dependency>
@@ -30,12 +30,12 @@
<dependency>
<groupId>com.twitter</groupId>
<artifactId>scrooge-generator</artifactId>
- <version>3.12.2-SNAPSHOT</version>
+ <version>3.12.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>util-app</artifactId>
- <version>6.10.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.caliper</groupId>
View
2  scrooge-core/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.twitter</groupId>
<artifactId>scrooge-core</artifactId>
<packaging>jar</packaging>
- <version>3.12.2-SNAPSHOT</version>
+ <version>3.12.3-SNAPSHOT</version>
<parent>
<groupId>com.twitter</groupId>
<artifactId>scala-parent-292</artifactId>
View
1  scrooge-core/src/main/scala/com/twitter/scrooge/TFieldBlob.scala
@@ -34,6 +34,7 @@ case class TFieldBlob(field: TField, data: Array[Byte]) {
def write(oprot: TProtocol): Unit = {
oprot.writeFieldBegin(field)
ThriftUtil.transfer(oprot, read, field.`type`)
+ oprot.writeFieldEnd()
}
/**
View
3  scrooge-core/src/main/scala/com/twitter/scrooge/ThriftUtil.scala
@@ -42,10 +42,11 @@ object ThriftUtil {
var done = false
while (!done) {
val field = inProt.readFieldBegin()
- outProt.writeFieldBegin(field)
if (field.`type` == TType.STOP) {
+ outProt.writeFieldStop()
done = true
} else {
+ outProt.writeFieldBegin(field)
transfer(outProt, inProt, field.`type`, maxDepth - 1)
inProt.readFieldEnd()
outProt.writeFieldEnd()
View
12 scrooge-generator/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.twitter</groupId>
<artifactId>scrooge-generator</artifactId>
<packaging>jar</packaging>
- <version>3.12.2-SNAPSHOT</version>
+ <version>3.12.3-SNAPSHOT</version>
<parent>
<groupId>com.twitter</groupId>
<artifactId>scala-parent-292</artifactId>
@@ -20,7 +20,7 @@
<dependency>
<groupId>com.twitter</groupId>
<artifactId>scrooge-runtime</artifactId>
- <version>3.12.2-SNAPSHOT</version>
+ <version>3.12.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- library dependencies -->
@@ -37,12 +37,12 @@
<dependency>
<groupId>com.twitter</groupId>
<artifactId>util-core</artifactId>
- <version>6.10.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>util-codec</artifactId>
- <version>6.10.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -101,13 +101,13 @@
<dependency>
<groupId>com.twitter</groupId>
<artifactId>finagle-core</artifactId>
- <version>6.10.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>finagle-thrift</artifactId>
- <version>6.10.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
View
16 scrooge-generator/src/test/scala/com/twitter/scrooge/backend/ScalaGeneratorSpec.scala
@@ -855,7 +855,7 @@ class ScalaGeneratorSpec extends JMockSpec with EvalHelper {
"pass through fields" should {
"pass through" in { _ =>
- val pt2 = PassThrough2(1, 2)
+ val pt2 = PassThrough2(1, PassThroughStruct(), PassThroughStruct())
val pt1 = {
val protocol = new TBinaryProtocol(new TMemoryBuffer(256))
@@ -873,7 +873,7 @@ class ScalaGeneratorSpec extends JMockSpec with EvalHelper {
}
"be copied" in { _ =>
- val pt2 = PassThrough2(1, 2)
+ val pt2 = PassThrough2(1, PassThroughStruct(), PassThroughStruct())
val pt1 = {
val protocol = new TBinaryProtocol(new TMemoryBuffer(256))
@@ -889,11 +889,11 @@ class ScalaGeneratorSpec extends JMockSpec with EvalHelper {
PassThrough2.decode(protocol)
}
- pt2roundTripped must be(PassThrough2(2, 2))
+ pt2roundTripped must be(PassThrough2(2, PassThroughStruct(), PassThroughStruct()))
}
"be removable" in { _ =>
- val pt2 = PassThrough2(1, 2)
+ val pt2 = PassThrough2(1, PassThroughStruct(), PassThroughStruct())
val pt1 = {
val protocol = new TBinaryProtocol(new TMemoryBuffer(256))
@@ -909,12 +909,12 @@ class ScalaGeneratorSpec extends JMockSpec with EvalHelper {
PassThrough2.decode(protocol)
}
- pt2roundTripped must be(PassThrough2(1, 0))
+ pt2roundTripped must be(PassThrough2(1, null, PassThroughStruct()))
}
"be able to add more" in { _ =>
val pt1 = PassThrough(1)
- val pt2 = PassThrough2(1, 2)
+ val pt2 = PassThrough2(1, PassThroughStruct(), null)
val f2 = pt2.getFieldBlob(PassThrough2.F2Field.id).get
val pt1w = pt1.setField(f2)
@@ -928,7 +928,7 @@ class ScalaGeneratorSpec extends JMockSpec with EvalHelper {
}
"be proxy-able" in { _ =>
- val pt2 = PassThrough2(1, 2)
+ val pt2 = PassThrough2(1, PassThroughStruct(), PassThroughStruct())
val pt1 = {
val protocol = new TBinaryProtocol(new TMemoryBuffer(256))
@@ -950,7 +950,7 @@ class ScalaGeneratorSpec extends JMockSpec with EvalHelper {
}
"be equallable" in { _ =>
- val pt2 = PassThrough2(1, 2)
+ val pt2 = PassThrough2(1, PassThroughStruct(), PassThroughStruct())
val pt1a = {
val protocol = new TBinaryProtocol(new TMemoryBuffer(256))
View
13 scrooge-generator/src/test/thrift/standalone/passthrough.thrift
@@ -1,17 +1,18 @@
namespace java thrift.test
+struct PassThroughStruct {
+ optional i32 f1
+ optional i32 f2
+}
+
struct PassThrough {
1: i32 f1
}
struct PassThrough2 {
1: i32 f1,
- 2: i32 f2
-}
-
-struct PassThrough3 {
- i32 f1
- i32 f2
+ 2: PassThroughStruct f2
+ 3: PassThroughStruct f3
}
// Ensure services properly compile
View
4 scrooge-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
<artifactId>scrooge-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>scrooge-maven-plugin</name>
- <version>3.12.1</version>
+ <version>3.12.2</version>
<prerequisites>
<maven>2.0.6</maven>
</prerequisites>
@@ -217,7 +217,7 @@
<dependency>
<groupId>com.twitter</groupId>
<artifactId>scrooge-generator_2.9.2</artifactId>
- <version>3.12.1</version>
+ <version>3.12.2</version>
</dependency>
</dependencies>
<reporting>
View
6 scrooge-ostrich/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.twitter</groupId>
<artifactId>scrooge-ostrich</artifactId>
<packaging>jar</packaging>
- <version>3.12.2-SNAPSHOT</version>
+ <version>3.12.3-SNAPSHOT</version>
<parent>
<groupId>com.twitter</groupId>
<artifactId>scala-parent-292</artifactId>
@@ -20,12 +20,12 @@
<dependency>
<groupId>com.twitter</groupId>
<artifactId>finagle-thrift</artifactId>
- <version>6.10.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>finagle-ostrich4</artifactId>
- <version>6.10.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
View
6 scrooge-runtime/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.twitter</groupId>
<artifactId>scrooge-runtime</artifactId>
<packaging>jar</packaging>
- <version>3.12.2-SNAPSHOT</version>
+ <version>3.12.3-SNAPSHOT</version>
<parent>
<groupId>com.twitter</groupId>
<artifactId>scala-parent-292</artifactId>
@@ -20,12 +20,12 @@
<dependency>
<groupId>com.twitter</groupId>
<artifactId>scrooge-core</artifactId>
- <version>3.12.2-SNAPSHOT</version>
+ <version>3.12.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>finagle-thrift</artifactId>
- <version>6.10.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
View
8 scrooge-serializer/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.twitter</groupId>
<artifactId>scrooge-serializer</artifactId>
<packaging>jar</packaging>
- <version>3.12.2-SNAPSHOT</version>
+ <version>3.12.3-SNAPSHOT</version>
<parent>
<groupId>com.twitter</groupId>
<artifactId>scala-parent-292</artifactId>
@@ -25,17 +25,17 @@
<dependency>
<groupId>com.twitter</groupId>
<artifactId>util-codec</artifactId>
- <version>6.10.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>util-core</artifactId>
- <version>6.10.1-SNAPSHOT</version>
+ <version>6.11.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>scrooge-core</artifactId>
- <version>3.12.2-SNAPSHOT</version>
+ <version>3.12.3-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Please sign in to comment.
Something went wrong with that request. Please try again.