From 1f09fbae0334a4e3c424132cbbffc5a6e71da520 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Wed, 8 Jul 2009 15:59:30 +0000 Subject: [PATCH] merge from 0.3 branch git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@792200 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 13 +++++++++--- DISCLAIMER.txt | 10 +++++++++ NOTICE.txt | 6 ++++-- .../apache/cassandra/service/Cassandra.java | 21 +++++++++++++++++++ .../apache/cassandra/service/CqlResult_t.java | 21 +++++++++++++++++++ .../service/InvalidRequestException.java | 21 +++++++++++++++++++ .../cassandra/service/NotFoundException.java | 21 +++++++++++++++++++ .../service/UnavailableException.java | 21 +++++++++++++++++++ .../service/batch_mutation_super_t.java | 21 +++++++++++++++++++ .../cassandra/service/batch_mutation_t.java | 21 +++++++++++++++++++ .../apache/cassandra/service/column_t.java | 21 +++++++++++++++++++ .../cassandra/service/superColumn_t.java | 21 +++++++++++++++++++ 12 files changed, 213 insertions(+), 5 deletions(-) create mode 100644 DISCLAIMER.txt diff --git a/CHANGES.txt b/CHANGES.txt index f79a8ee11a..63fbe76b43 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,8 +9,17 @@ using the newly introduced nodeprobe utility. -0.3.0 +0.3.0 RC3 + * Fix potential deadlock under load in TCPConnection. + (CASSANDRA-220) +0.3.0 RC2 + * Fix possible data loss when server is stopped after replaying + log but before new inserts force memtable flush. + (CASSANDRA-204) + * Added BUGS file + +0.3.0 RC1 * Range queries on keys, including user-defined key collation * Remove support * Workarounds for a weird bug in JDK select/register that seems @@ -25,5 +34,3 @@ * Combined blocking and non-blocking versions of insert APIs * Added FlushPeriodInMinutes configuration parameter to force flushing of infrequently-updated ColumnFamilies - - diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt new file mode 100644 index 0000000000..16d893eab8 --- /dev/null +++ b/DISCLAIMER.txt @@ -0,0 +1,10 @@ +Apache Cassandra is an effort undergoing incubation at The ASF, sponsored by the +Apache Incubator Project Management Committee (PMC). + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness or +stability of the code, it does indicate that the project has yet to be fully +endorsed by the ASF. diff --git a/NOTICE.txt b/NOTICE.txt index 5919825cdb..b95d1a91f4 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,6 +1,8 @@ -This product includes software developed by The Apache Software -Foundation (http://www.apache.org/). +Apache Cassandra +Copyright 2009 The Apache Software Foundation +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). From Lucene's notice file: diff --git a/interface/gen-java/org/apache/cassandra/service/Cassandra.java b/interface/gen-java/org/apache/cassandra/service/Cassandra.java index d781acf8d6..1bb913ff03 100644 --- a/interface/gen-java/org/apache/cassandra/service/Cassandra.java +++ b/interface/gen-java/org/apache/cassandra/service/Cassandra.java @@ -4,6 +4,27 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; +/* + * + * 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.util.List; import java.util.ArrayList; diff --git a/interface/gen-java/org/apache/cassandra/service/CqlResult_t.java b/interface/gen-java/org/apache/cassandra/service/CqlResult_t.java index 073f51a5f7..018d6b53d0 100644 --- a/interface/gen-java/org/apache/cassandra/service/CqlResult_t.java +++ b/interface/gen-java/org/apache/cassandra/service/CqlResult_t.java @@ -4,6 +4,27 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; +/* + * + * 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.util.List; import java.util.ArrayList; diff --git a/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java b/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java index 524bc0c4fc..9f2b95d37d 100644 --- a/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java +++ b/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java @@ -4,6 +4,27 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; +/* + * + * 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.util.List; import java.util.ArrayList; diff --git a/interface/gen-java/org/apache/cassandra/service/NotFoundException.java b/interface/gen-java/org/apache/cassandra/service/NotFoundException.java index 5b47e1089e..21937f15eb 100644 --- a/interface/gen-java/org/apache/cassandra/service/NotFoundException.java +++ b/interface/gen-java/org/apache/cassandra/service/NotFoundException.java @@ -4,6 +4,27 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; +/* + * + * 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.util.List; import java.util.ArrayList; diff --git a/interface/gen-java/org/apache/cassandra/service/UnavailableException.java b/interface/gen-java/org/apache/cassandra/service/UnavailableException.java index 22bad0be43..e5231d5b0c 100644 --- a/interface/gen-java/org/apache/cassandra/service/UnavailableException.java +++ b/interface/gen-java/org/apache/cassandra/service/UnavailableException.java @@ -4,6 +4,27 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; +/* + * + * 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.util.List; import java.util.ArrayList; diff --git a/interface/gen-java/org/apache/cassandra/service/batch_mutation_super_t.java b/interface/gen-java/org/apache/cassandra/service/batch_mutation_super_t.java index d3aa7ba12f..770a6a69ec 100644 --- a/interface/gen-java/org/apache/cassandra/service/batch_mutation_super_t.java +++ b/interface/gen-java/org/apache/cassandra/service/batch_mutation_super_t.java @@ -4,6 +4,27 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; +/* + * + * 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.util.List; import java.util.ArrayList; diff --git a/interface/gen-java/org/apache/cassandra/service/batch_mutation_t.java b/interface/gen-java/org/apache/cassandra/service/batch_mutation_t.java index ffabd5ab84..4c4cc662da 100644 --- a/interface/gen-java/org/apache/cassandra/service/batch_mutation_t.java +++ b/interface/gen-java/org/apache/cassandra/service/batch_mutation_t.java @@ -4,6 +4,27 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; +/* + * + * 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.util.List; import java.util.ArrayList; diff --git a/interface/gen-java/org/apache/cassandra/service/column_t.java b/interface/gen-java/org/apache/cassandra/service/column_t.java index 21200a2ee9..5b1d193e87 100644 --- a/interface/gen-java/org/apache/cassandra/service/column_t.java +++ b/interface/gen-java/org/apache/cassandra/service/column_t.java @@ -4,6 +4,27 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; +/* + * + * 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.util.List; import java.util.ArrayList; diff --git a/interface/gen-java/org/apache/cassandra/service/superColumn_t.java b/interface/gen-java/org/apache/cassandra/service/superColumn_t.java index 49462bd2a4..43d311a7cd 100644 --- a/interface/gen-java/org/apache/cassandra/service/superColumn_t.java +++ b/interface/gen-java/org/apache/cassandra/service/superColumn_t.java @@ -4,6 +4,27 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; +/* + * + * 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.util.List; import java.util.ArrayList;