Permalink
Browse files

merge from 0.8

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1126707 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 98dfbfa commit 885cf0aeccc16c93acacacbddfd56e6c2e69bde6 @tjake tjake committed May 23, 2011
Showing with 2 additions and 82 deletions.
  1. +2 −12 build.xml
  2. +0 −70 src/java/org/apache/cassandra/hadoop/hadoop.genavro
View
@@ -592,24 +592,14 @@ url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
<taskdef name="avro-protocol" classname="org.apache.avro.specific.ProtocolTask">
<classpath refid="cassandra.classpath" />
</taskdef>
- <uptodate property="avroInterfaceUpToDate"
- srcfile="${build.src.java}/org/apache/cassandra/hadoop/hadoop.genavro"
- targetfile="${build.src.gen-java}/org/apache/cassandra/hadoop/hadoop.avpr" />
<uptodate property="avroINProtoUpToDate" srcfile="${avro.src}/internode.genavro"
targetfile="${build.dir}/internode.avpr" />
</target>
<target name="avro-generate"
- depends="avro-interface-generate-hadoop,avro-interface-generate-internode"
+ depends="avro-interface-generate-internode"
description="Generates Java Avro classes for client and internal use." />
-
- <target name="avro-interface-generate-hadoop" unless="avroInterfaceUpToDate"
- depends="init,check-avro-generate,maven-ant-tasks-retrieve-build">
- <avromacro protocolname="hadoop"
- inputfile="${build.src.java}/org/apache/cassandra/hadoop/hadoop.genavro"
- jsondir="${build.src.gen-java}/org/apache/cassandra/hadoop"
- outputdir="${build.src}" />
- </target>
+
<target name="avro-interface-generate-internode" unless="avroINProtoUpToDate"
depends="init,check-avro-generate,maven-ant-tasks-retrieve-build">
<avromacro protocolname="internode" inputfile="${avro.src}/internode.genavro"
@@ -1,70 +0,0 @@
-/**
- * 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.
- */
-
-/**
- * Cassandra client interface (legacy).
- */
-@namespace("org.apache.cassandra.hadoop.avro")
-
-protocol Cassandra {
- record Column {
- bytes name;
- bytes value;
- long timestamp;
- union { int, null } ttl;
- }
-
- record SuperColumn {
- bytes name;
- array<Column> columns;
- }
-
- record ColumnOrSuperColumn {
- union { Column, null } column;
- union { SuperColumn, null } super_column;
- }
-
- record SliceRange {
- bytes start;
- bytes finish;
- boolean reversed;
- int count;
- union { array<bytes>, null } bitmasks;
- }
-
- record SlicePredicate {
- union { array<bytes>, null } column_names;
- union { SliceRange, null } slice_range;
- }
-
- record Deletion {
- long timestamp;
- union { bytes, null } super_column;
- union { SlicePredicate, null } predicate;
- }
-
- record Mutation {
- union { ColumnOrSuperColumn, null } column_or_supercolumn;
- union { Deletion, null } deletion;
- }
-
- record StreamingMutation {
- bytes key;
- Mutation mutation;
- }
-}

0 comments on commit 885cf0a

Please sign in to comment.