You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/05/27 17:57:12 UTC
[1/4] cassandra git commit: test-all results incomplete when parsed
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 162489aed -> 860141229
refs/heads/trunk 352302f5a -> 3c98472d5
test-all results incomplete when parsed
patch by aweisberg; reviewed by jasobrown for CASSANDRA-9463
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/162489ae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/162489ae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/162489ae
Branch: refs/heads/trunk
Commit: 162489aed57866d5f8185d78a05588e1e81c549e
Parents: 91187b5
Author: Jason Brown <ja...@gmail.com>
Authored: Tue May 26 15:29:01 2015 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed May 27 08:39:32 2015 -0700
----------------------------------------------------------------------
build.xml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/162489ae/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 69f6a61..cbedf20 100644
--- a/build.xml
+++ b/build.xml
@@ -1116,6 +1116,7 @@
<attribute name="exclude" default="" />
<attribute name="filelist" default="" />
<attribute name="poffset" default="0"/>
+ <attribute name="outsubdir" default=""/>
<attribute name="usejacoco" default="no"/>
<sequential>
@@ -1127,6 +1128,7 @@
<echo message="running @{suitename} tests"/>
<mkdir dir="${build.test.dir}/cassandra"/>
<mkdir dir="${build.test.dir}/output"/>
+ <mkdir dir="${build.test.dir}/output/@{outsubdir}"/>
<junit fork="on" forkmode="@{forkmode}" failureproperty="testfailed" maxmemory="1024m" timeout="@{timeout}">
<sysproperty key="net.sourceforge.cobertura.datafile" file="${cobertura.datafile}"/>
<formatter type="xml" usefile="true"/>
@@ -1152,14 +1154,14 @@
<include name="**/*.jar" />
</fileset>
</classpath>
- <batchtest todir="${build.test.dir}/output">
+ <batchtest todir="${build.test.dir}/output/@{outsubdir}">
<fileset dir="@{inputdir}" includes="@{filter}" excludes="@{exclude}"/>
<filelist dir="@{inputdir}" files="@{filelist}"/>
</batchtest>
</junit>
<junitreport todir="${build.test.dir}">
<fileset dir="${build.test.dir}/output">
- <include name="TEST-*.xml"/>
+ <include name="**/TEST-*.xml"/>
</fileset>
<report format="frames" todir="${build.test.dir}/junitreport"/>
</junitreport>
@@ -1268,7 +1270,7 @@
<fileset file="${test.conf}/commitlog_compression.yaml"/>
</concat>
<echo>Compressed config: ${compressed_yaml}</echo>
- <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}">
+ <testmacro suitename="unit" inputdir="${test.unit.src}" exclude="**/pig/*.java" timeout="${test.timeout}" outsubdir="compression">
<jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
<jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
<jvmarg value="-Dcorrupt-sstable-root=${test.data}/corrupt-sstables"/>
[4/4] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by sn...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3c98472d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c98472d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c98472d
Branch: refs/heads/trunk
Commit: 3c98472d54f8b530f31219a46fdd84996c31136f
Parents: 352302f 8601412
Author: Robert Stupp <sn...@snazy.de>
Authored: Wed May 27 17:55:57 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed May 27 17:55:57 2015 +0200
----------------------------------------------------------------------
doc/cql3/CQL.textile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/4] cassandra git commit: Example UDFs don't work
Posted by sn...@apache.org.
Example UDFs don't work
patch by Christopher Batey; reviewed by Robert Stupp for CASSANDRA-9480
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86014122
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86014122
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86014122
Branch: refs/heads/trunk
Commit: 860141229ab3291675d9b632e34ab4405359316b
Parents: 162489a
Author: Christopher Batey <ch...@gmail.com>
Authored: Wed May 27 17:55:14 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed May 27 17:55:14 2015 +0200
----------------------------------------------------------------------
doc/cql3/CQL.textile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/86014122/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 2463a01..91d8dd8 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -1422,6 +1422,7 @@ Note that you can use the double-quoted string syntax to enclose the UDF source
bc(sample)..
CREATE FUNCTION some_function ( arg int )
+ RETURNS NULL ON NULL INPUT
RETURNS int
LANGUAGE java
AS $$ return arg; $$;
@@ -1432,7 +1433,8 @@ p.
bc(sample).
CREATE TYPE custom_type (txt text, i int);
-CREATE FUNCTION fct_using_udt ( udtarg frozen<customType> )
+CREATE FUNCTION fct_using_udt ( udtarg frozen<custom_type> )
+ RETURNS NULL ON NULL INPUT
RETURNS text
LANGUAGE java
AS $$ return udtarg.getString("txt"); $$;
@@ -1484,7 +1486,7 @@ CREATE AGGREGATE average ( int )
FINALFUNC averageFinal
INITCOND (0, 0);
-CREATE TYPE atable (
+CREATE TABLE atable (
pk int PRIMARY KEY,
val int);
INSERT INTO atable (pk, val) VALUES (1,1);
[3/4] cassandra git commit: Example UDFs don't work
Posted by sn...@apache.org.
Example UDFs don't work
patch by Christopher Batey; reviewed by Robert Stupp for CASSANDRA-9480
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86014122
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86014122
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86014122
Branch: refs/heads/cassandra-2.2
Commit: 860141229ab3291675d9b632e34ab4405359316b
Parents: 162489a
Author: Christopher Batey <ch...@gmail.com>
Authored: Wed May 27 17:55:14 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Wed May 27 17:55:14 2015 +0200
----------------------------------------------------------------------
doc/cql3/CQL.textile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/86014122/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 2463a01..91d8dd8 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -1422,6 +1422,7 @@ Note that you can use the double-quoted string syntax to enclose the UDF source
bc(sample)..
CREATE FUNCTION some_function ( arg int )
+ RETURNS NULL ON NULL INPUT
RETURNS int
LANGUAGE java
AS $$ return arg; $$;
@@ -1432,7 +1433,8 @@ p.
bc(sample).
CREATE TYPE custom_type (txt text, i int);
-CREATE FUNCTION fct_using_udt ( udtarg frozen<customType> )
+CREATE FUNCTION fct_using_udt ( udtarg frozen<custom_type> )
+ RETURNS NULL ON NULL INPUT
RETURNS text
LANGUAGE java
AS $$ return udtarg.getString("txt"); $$;
@@ -1484,7 +1486,7 @@ CREATE AGGREGATE average ( int )
FINALFUNC averageFinal
INITCOND (0, 0);
-CREATE TYPE atable (
+CREATE TABLE atable (
pk int PRIMARY KEY,
val int);
INSERT INTO atable (pk, val) VALUES (1,1);