Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: voldemort/voldemort
base: master
...
head fork: voldemort/voldemort
compare: li-r1012
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 8 files changed
  • 0 commit comments
  • 1 contributor
Commits on Feb 17, 2010
@afeinberg afeinberg Fixed a backwards compatibility issue in the client protocol. d3d1557
@afeinberg afeinberg Bumped up the version to account for compatibility fix. 3965870
Commits on Feb 25, 2010
@afeinberg afeinberg Disabling KeyedResourcePool#close(K key) ba0a25e
Commits on Mar 05, 2010
@afeinberg afeinberg Temprorarily reverted to protobuf 2.1.0.
	  This is temprorary due to a backwards compatibility issue
      due, to another application pulling a protobuf 2.1.0 jar file.
      Apparently files codegen'd with 2.2.0 will *not* work a 2.1.0
      jar file.
d7ec5c3
View
2  build.properties
@@ -33,4 +33,4 @@ tomcat.manager.password=tomcat
tomcat.context=/voldemort
## Release
-curr.release=0.70.1
+curr.release=0.70.4
View
BIN  lib/protobuf-java-2.1.0.jar
Binary file not shown
View
BIN  lib/protobuf-java-2.2.0.jar
Binary file not shown
View
19,353 src/java/voldemort/client/protocol/pb/VAdminProto.java
9,219 additions, 10,134 deletions not shown
View
11,830 src/java/voldemort/client/protocol/pb/VProto.java
5,664 additions, 6,166 deletions not shown
View
4 src/java/voldemort/serialization/VoldemortOpCode.java
@@ -27,6 +27,6 @@
public static final byte DELETE_PARTITIONS_OP_CODE = 7;
public static final byte UPDATE_METADATA_OP_CODE = 8;
public static final byte REDIRECT_GET_OP_CODE = 9;
- public static final byte GET_METADATA_OP_CODE = 10;
- public static final byte GET_VERSION_OP_CODE = 11;
+ public static final byte GET_VERSION_OP_CODE = 10;
+ public static final byte GET_METADATA_OP_CODE = 11;
}
View
2  src/java/voldemort/server/protocol/vold/VoldemortNativeRequestHandler.java
@@ -88,7 +88,7 @@ private RequestRoutingType getRoutingType(DataInputStream inputStream) throws IO
routingType = RequestRoutingType.getRequestRoutingType(isRouted, false);
}
- else if(protocolVersion > 1) {
+ if(protocolVersion > 1) {
int routingTypeCode = inputStream.readByte();
routingType = RequestRoutingType.getRequestRoutingType(routingTypeCode);
}
View
14 src/java/voldemort/utils/pool/KeyedResourcePool.java
@@ -228,19 +228,7 @@ public void close() {
}
}
- public void close(K key) {
- Pool<V> pool = resourcesMap.get(key);
-
- if(pool == null)
- throw new IllegalArgumentException("Invalid key '" + key
- + "': no resource pool exists for that key.");
-
- // destroy each resource in the queue
- for(V value = pool.nonBlockingGet(); value != null; value = pool.nonBlockingGet())
- destroyResource(key, pool, value);
-
- resourcesMap.remove(key);
- }
+ public void close(K key) { }
/**
* Return the total number of resources for the given key whether they are

No commit comments for this range

Something went wrong with that request. Please try again.