You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/11/20 18:56:53 UTC
[1/3] git commit: Update versions, licenses for 1.2.12 release
Updated Branches:
refs/heads/cassandra-2.0 fcb2c65f0 -> cb7eb8687
Update versions, licenses for 1.2.12 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/026865f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/026865f2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/026865f2
Branch: refs/heads/cassandra-2.0
Commit: 026865f2a36d9685057c407e3fa528c101ab46b7
Parents: 5097032
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Nov 20 09:43:28 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Nov 20 09:43:28 2013 +0100
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 ++++++
.../cassandra/pig/CqlTableDataTypeTest.java | 21 ++++++++++++++++++++
.../pig/ThriftColumnFamilyDataTypeTest.java | 21 ++++++++++++++++++++
4 files changed, 49 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/026865f2/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 50323ca..8efb7a3 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="1.2.11"/>
+ <property name="base.version" value="1.2.12"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/026865f2/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 6643ed9..93894b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.2.12) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne <sl...@apache.org> Wed, 20 Nov 2013 09:41:23 +0100
+
cassandra (1.2.11) unstable; urgency=low
* New release
http://git-wip-us.apache.org/repos/asf/cassandra/blob/026865f2/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java b/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java
index a0f1f47..c81ff07 100644
--- a/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java
+++ b/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java
@@ -1,4 +1,25 @@
package org.apache.cassandra.pig;
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
import java.io.IOException;
import java.nio.charset.CharacterCodingException;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/026865f2/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java b/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java
index 2f97549..2cf1c89 100644
--- a/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java
+++ b/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java
@@ -1,4 +1,25 @@
package org.apache.cassandra.pig;
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
import java.io.IOException;
import java.nio.charset.CharacterCodingException;
[2/3] git commit: update pig example scripts Patch by Jeremy Hanna,
reviewed by brandonwilliams for CASSANDRA-6239
Posted by br...@apache.org.
update pig example scripts
Patch by Jeremy Hanna, reviewed by brandonwilliams for CASSANDRA-6239
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f79f532
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f79f532
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f79f532
Branch: refs/heads/cassandra-2.0
Commit: 5f79f5321bbbbac383b727fbbf60891b4c5e4136
Parents: 026865f
Author: Brandon Williams <br...@apache.org>
Authored: Wed Nov 20 10:19:17 2013 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Nov 20 10:19:17 2013 -0600
----------------------------------------------------------------------
examples/pig/example-script-cql.pig | 11 +++++++++++
examples/pig/example-script.pig | 14 +-------------
2 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f79f532/examples/pig/example-script-cql.pig
----------------------------------------------------------------------
diff --git a/examples/pig/example-script-cql.pig b/examples/pig/example-script-cql.pig
new file mode 100644
index 0000000..63656a7
--- /dev/null
+++ b/examples/pig/example-script-cql.pig
@@ -0,0 +1,11 @@
+-- CqlStorage
+libdata = LOAD 'cql://libdata/libout' USING CqlStorage();
+book_by_mail = FILTER libdata BY C_OUT_TY == 'BM';
+
+libdata_buildings = FILTER libdata BY SQ_FEET > 0;
+state_flat = FOREACH libdata_buildings GENERATE STABR AS State,SQ_FEET AS SquareFeet;
+state_grouped = GROUP state_flat BY State;
+state_footage = FOREACH state_grouped GENERATE group AS State, SUM(state_flat.SquareFeet) AS TotalFeet:int;
+
+insert_format= FOREACH state_footage GENERATE TOTUPLE(TOTUPLE('year',2011),TOTUPLE('state',State)),TOTUPLE(TotalFeet);
+STORE insert_format INTO 'cql://libdata/libsqft?output_query=UPDATE%20libdata.libsqft%20SET%20sqft%20%3D%20%3F' USING CqlStorage;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f79f532/examples/pig/example-script.pig
----------------------------------------------------------------------
diff --git a/examples/pig/example-script.pig b/examples/pig/example-script.pig
index 8b69b99..d47fc28 100644
--- a/examples/pig/example-script.pig
+++ b/examples/pig/example-script.pig
@@ -6,16 +6,4 @@ namegroups = GROUP colnames BY (chararray) $0;
namecounts = FOREACH namegroups GENERATE COUNT($1), group;
orderednames = ORDER namecounts BY $0 DESC;
topnames = LIMIT orderednames 50;
-dump topnames;
-
--- CqlStorage
-libdata = LOAD 'cql://libdata/libout' USING CqlStorage();
-book_by_mail = FILTER libdata BY C_OUT_TY == 'BM';
-
-libdata_buildings = FILTER libdata BY SQ_FEET > 0;
-state_flat = FOREACH libdata_buildings GENERATE STABR AS State,SQ_FEET AS SquareFeet;
-state_grouped = GROUP state_flat BY State;
-state_footage = FOREACH state_grouped GENERATE GROUP AS State, SUM(state_flat.SquareFeet) AS TotalFeet:int;
-
-insert_format= FOREACH state_footage GENERATE TOTUPLE(TOTUPLE('year',2011),TOTUPLE('state',State)),TOTUPLE(TotalFeet);
-STORE insert_format INTO 'cql://libdata/libsqft?output_query=UPDATE%20libdata.libsqft%20SET%20sqft%20%3D%20%3F' USING CqlStorage;
\ No newline at end of file
+dump topnames;
\ No newline at end of file
[3/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
build.xml
debian/changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb7eb868
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb7eb868
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb7eb868
Branch: refs/heads/cassandra-2.0
Commit: cb7eb8687d332debf1d1aa1fab9cba9c68638763
Parents: fcb2c65 5f79f53
Author: Brandon Williams <br...@apache.org>
Authored: Wed Nov 20 11:54:57 2013 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Nov 20 11:54:57 2013 -0600
----------------------------------------------------------------------
examples/pig/example-script-cql.pig | 11 ++++++++++
examples/pig/example-script.pig | 14 +------------
.../cassandra/pig/CqlTableDataTypeTest.java | 21 ++++++++++++++++++++
.../pig/ThriftColumnFamilyDataTypeTest.java | 21 ++++++++++++++++++++
4 files changed, 54 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb7eb868/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java
index 352b2e2,c81ff07..1ae9806
--- a/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java
+++ b/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java
@@@ -1,22 -1,25 +1,43 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.cassandra.pig;
+ /*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
import java.io.IOException;
import java.nio.charset.CharacterCodingException;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb7eb868/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java
index cc54620,2cf1c89..7bccc23
--- a/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java
+++ b/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java
@@@ -1,22 -1,25 +1,43 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.cassandra.pig;
+ /*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
import java.io.IOException;
import java.nio.charset.CharacterCodingException;