change maxRecords to recordsPerPartition in fetch API and protobuf

These are cosmetic changes. The client-side and server-side code does not properly do recordsPerPartition yet. Added a few TODOs in the code too.
bbansal · Mar 20, 2013 · 5aca5c0 · 5aca5c0
1 parent a2d9ebb
commit 5aca5c0
Show file tree

Hide file tree

Showing 10 changed files with 254 additions and 233 deletions.
diff --git a/src/java/voldemort/client/protocol/admin/AdminClient.java b/src/java/voldemort/client/protocol/admin/AdminClient.java
@@ -1444,7 +1444,7 @@ private void initiateFetchRequest(DataOutputStream outputStream,
                                           boolean fetchValues,
                                           boolean fetchMasterEntries,
                                           Cluster initialCluster,
-                                          long maxRecords) throws IOException {
+                                          long recordsPerPartition) throws IOException {
             HashMap<Integer, List<Integer>> filteredReplicaToPartitionList = Maps.newHashMap();
             if(fetchMasterEntries) {
                 if(!replicaToPartitionList.containsKey(0)) {
@@ -1459,7 +1459,7 @@ private void initiateFetchRequest(DataOutputStream outputStream,
                                                                                                                     .setFetchValues(fetchValues)
                                                                                                                     .addAllReplicaToPartition(ProtoUtils.encodePartitionTuple(filteredReplicaToPartitionList))
                                                                                                                     .setStore(storeName)
-                                                                                                                    .setMaxRecords(maxRecords);
+                                                                                                                    .setRecordsPerPartition(recordsPerPartition);
 
             try {
                 if(filter != null) {
@@ -1582,14 +1582,14 @@ public Iterator<Pair<ByteArray, Versioned<byte[]>>> fetchEntries(int nodeId,
                                                                          List<Integer> partitionList,
                                                                          VoldemortFilter filter,
                                                                          boolean fetchMasterEntries,
-                                                                         long maxRecords) {
+                                                                         long recordsPerPartition) {
             return fetchEntries(nodeId,
                                 storeName,
                                 helperOps.getReplicaToPartitionMap(nodeId, storeName, partitionList),
                                 filter,
                                 fetchMasterEntries,
                                 null,
-                                maxRecords);
+                                recordsPerPartition);
         }
 
         /**
@@ -1656,7 +1656,7 @@ public Iterator<Pair<ByteArray, Versioned<byte[]>>> fetchEntries(int nodeId,
                                                                          VoldemortFilter filter,
                                                                          boolean fetchMasterEntries,
                                                                          Cluster initialCluster,
-                                                                         long maxRecords) {
+                                                                         long recordsPerPartition) {
 
             Node node = AdminClient.this.getAdminClientCluster().getNodeById(nodeId);
             final SocketDestination destination = new SocketDestination(node.getHost(),
@@ -1674,7 +1674,7 @@ public Iterator<Pair<ByteArray, Versioned<byte[]>>> fetchEntries(int nodeId,
                                      true,
                                      fetchMasterEntries,
                                      initialCluster,
-                                     maxRecords);
+                                     recordsPerPartition);
             } catch(IOException e) {
                 helperOps.close(sands.getSocket());
                 socketPool.checkin(destination, sands);
@@ -1800,14 +1800,14 @@ public Iterator<ByteArray> fetchKeys(int nodeId,
                                              List<Integer> partitionList,
                                              VoldemortFilter filter,
                                              boolean fetchMasterEntries,
-                                             long maxRecords) {
+                                             long recordsPerPartition) {
             return fetchKeys(nodeId,
                              storeName,
                              helperOps.getReplicaToPartitionMap(nodeId, storeName, partitionList),
                              filter,
                              fetchMasterEntries,
                              null,
-                             maxRecords);
+                             recordsPerPartition);
         }
 
         /**
@@ -1852,7 +1852,7 @@ public Iterator<ByteArray> fetchKeys(int nodeId,
                                              VoldemortFilter filter,
                                              boolean fetchMasterEntries,
                                              Cluster initialCluster,
-                                             long maxRecords) {
+                                             long recordsPerPartition) {
             Node node = AdminClient.this.getAdminClientCluster().getNodeById(nodeId);
             final SocketDestination destination = new SocketDestination(node.getHost(),
                                                                         node.getAdminPort(),
@@ -1869,7 +1869,7 @@ public Iterator<ByteArray> fetchKeys(int nodeId,
                                      false,
                                      fetchMasterEntries,
                                      initialCluster,
-                                     maxRecords);
+                                     recordsPerPartition);
             } catch(IOException e) {
                 helperOps.close(sands.getSocket());
                 socketPool.checkin(destination, sands);