Permalink
Browse files

Updating branch to bring it up to date with master

  • Loading branch information...
2 parents ee9c7bc + 36bd7f1 commit acc46cdcbd7aa110e4fcd07bb3f162a26018b633 @rsumbaly committed Jan 3, 2011
Showing 340 changed files with 29,664 additions and 9,743 deletions.
View
@@ -39,16 +39,18 @@
<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/jline-0.9.94.jar"/>
<classpathentry kind="lib" path="lib/commons-pool-1.5.2.jar"/>
- <classpathentry kind="lib" path="lib/protobuf-java-2.2.0.jar"/>
+ <classpathentry kind="lib" path="lib/protobuf-java-2.3.0.jar"/>
<classpathentry kind="lib" path="contrib/ec2-testing/lib/typica.jar"/>
<classpathentry kind="lib" path="lib/libthrift-0.2.0.jar"/>
<classpathentry kind="lib" path="lib/google-collect-1.0.jar"/>
- <classpathentry kind="lib" path="lib/je-4.0.92.jar"/>
+ <classpathentry kind="lib" path="lib/je-4.0.103.jar"/>
<classpathentry kind="lib" path="lib/paranamer-2.1.jar"/>
<classpathentry kind="lib" path="lib/jackson-mapper-asl-1.4.0.jar"/>
<classpathentry kind="lib" path="lib/jackson-core-asl-1.4.0.jar"/>
<classpathentry kind="lib" path="lib/avro-modified-jdk5-1.3.0.jar"/>
<classpathentry kind="lib" path="contrib/hadoop/lib/pig-0.7.1-dev-core.jar"/>
<classpathentry kind="lib" path="contrib/krati/lib/krati-0.3.4.jar"/>
- <classpathentry kind="output" path="classes"/>
+ <classpathentry kind="lib" path="lib/jna.jar"/>
+ <classpathentry kind="lib" path="lib/mockito-all-1.8.5.jar" />
+ <classpathentry kind="output" path="classes"/>
</classpath>
View
@@ -2,19 +2,24 @@ Alex Feinberg
Antoine Toulme
Anthony Lauzon
Bhupesh Bansal
+Bruce Ritchie
Chris Riccomini
Claudio Cherubino
Dain Sundstrom
+Dave Brosius
Elias Torres
Eric Evans
Geir Magnusson Jr.
Ismael Juma
+Jakob Homan
Janne Hietamäki
Jay Kreps
+Jonathan Traupman
Joshua Tuberville
Kirk True
Michael R. Head
Mike Frost
+Neha Narkhede
Padraig O'Sullivan
Paul Lindner
Rob Adams
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+#
+# Copyright 2010 LinkedIn, Inc
+#
+# Licensed 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.
+#
+# One time grandfathering script to convert all read-only store dirs to
+# new format
+if [ $# -ne 1 ];
+then
+ echo 'USAGE: bin/grandfather-readonly.sh [readonly-folder]'
+ exit 1
+fi
+# Read args
+READ_ONLY_DIR=$1
+
+# Create temporary metadata file
+METADATA_FILE="$(basename $0).$$.tmp"
+echo "{\"format\":\"ro0\"}" > $METADATA_FILE
+
+for stores in $READ_ONLY_DIR/*
+do
+ if [ -d $stores ]; then
+
+ echo ---Working on store ${stores} ---
+ # Convert all to .temp
+ numVersions=`find $stores -name version-* | grep -v .bak | grep -v .temp | wc -l`
+ maxVersion=`find $stores -name version-* | grep -v .bak | grep -v .temp | sed 's/^\(.*\)\-\([0-9]*\)$/\2/' | sort -n | tail -1`
+ if [ $numVersions -eq 1 ]; then
+ cp $METADATA_FILE ${stores}/version-${maxVersion}/.metadata
+ echo Added metadata to ${stores}/version-${maxVersion}
+ fi
+ if [ $numVersions -gt 1 ]; then
+ for versionDirNo in `find $stores -name version-* | grep -v .bak | grep -v .temp | sed 's/^\(.*\)\-\([0-9]*\)$/\2/' | sort -n`
+ do
+ mv ${stores}/version-${versionDirNo} ${stores}/version-${maxVersion}.temp
+ echo Moved ${stores}/version-${versionDirNo} to ${stores}/version-${maxVersion}.temp
+ cp $METADATA_FILE ${stores}/version-${maxVersion}.temp/.metadata
+ echo Added metadata to ${stores}/version-${maxVersion}.temp
+ let maxVersion=maxVersion-1
+ done
+ fi
+
+ # Convert all .temp to normal
+ numVersionsTmp=`find $stores -name version-*.temp | grep -v .bak | wc -l`
+ if [ $numVersionsTmp -gt 1 ]; then
+ for versionDir in `find $stores -name version-*.temp | grep -v .bak | sed 's/^\(.*\-\)\([0-9]*\).temp$/\1\2/'`
+ do
+ mv ${versionDir}.temp ${versionDir}
+ echo Moved ${versionDir}.temp to ${versionDir}
+ done
+ fi
+ fi
+done
+
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-#
-# Copyright 2008-2010 LinkedIn, Inc
-#
-# Licensed 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.
-#
-
-base_dir=$(dirname $0)/..
-
-$base_dir/bin/run-class.sh voldemort.client.rebalance.RebalanceClusterBuilder $@
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-#
-# Copyright 2008-2009 LinkedIn, Inc
-#
-# Licensed 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.
-#
-
-bin_dir=$(dirname $0)
-
-${bin_dir}/run-class.sh voldemort.performance.RemoteTest $@
View
@@ -2,6 +2,7 @@
src.dir=src
java.dir=src/java
python.dir=clients/python
+python.proto.dir=clients/python/voldemort/protocol
protobuff.dir=src/proto
lib.dir=lib
classes.dir=dist/classes
Oops, something went wrong.

0 comments on commit acc46cd

Please sign in to comment.