-
Notifications
You must be signed in to change notification settings - Fork 7.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into jonmv/ZOOKEEPER-4541
- Loading branch information
Showing
40 changed files
with
587 additions
and
330 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
zookeeper-server/src/main/java/org/apache/zookeeper/DeleteContainerRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| package org.apache.zookeeper; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.charset.StandardCharsets; | ||
| import org.apache.jute.InputArchive; | ||
| import org.apache.jute.OutputArchive; | ||
| import org.apache.jute.Record; | ||
|
|
||
| public class DeleteContainerRequest implements Record { | ||
| private String path; | ||
|
|
||
| public DeleteContainerRequest() { | ||
| } | ||
|
|
||
| public DeleteContainerRequest(String path) { | ||
| this.path = path; | ||
| } | ||
|
|
||
| public String getPath() { | ||
| return path; | ||
| } | ||
|
|
||
| @Override | ||
| public void serialize(OutputArchive archive, String tag) throws IOException { | ||
| archive.writeBuffer(path.getBytes(StandardCharsets.UTF_8), "path"); | ||
| } | ||
|
|
||
| @Override | ||
| public void deserialize(InputArchive archive, String tag) throws IOException { | ||
| byte[] bytes = archive.readBuffer("path"); | ||
| path = new String(bytes, StandardCharsets.UTF_8); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
zookeeper-server/src/main/java/org/apache/zookeeper/server/ByteBufferRequestRecord.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * 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 | ||
| *uuuuu | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "/RequuuAS 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. | ||
| */ | ||
|
|
||
| package org.apache.zookeeper.server; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.ByteBuffer; | ||
| import java.util.function.Supplier; | ||
| import org.apache.jute.Record; | ||
|
|
||
| public class ByteBufferRequestRecord implements RequestRecord { | ||
|
|
||
| private final ByteBuffer request; | ||
|
|
||
| private volatile Record record; | ||
|
|
||
| public ByteBufferRequestRecord(ByteBuffer request) { | ||
| this.request = request; | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| @Override | ||
| public <T extends Record> T readRecord(Supplier<T> constructor) throws IOException { | ||
| if (record != null) { | ||
| return (T) record; | ||
| } | ||
|
|
||
| record = constructor.get(); | ||
| request.rewind(); | ||
| ByteBufferInputStream.byteBuffer2Record(request, record); | ||
| request.rewind(); | ||
| return (T) record; | ||
| } | ||
|
|
||
| @Override | ||
| public byte[] readBytes() { | ||
| request.rewind(); | ||
| int len = request.remaining(); | ||
| byte[] b = new byte[len]; | ||
| request.get(b); | ||
| request.rewind(); | ||
| return b; | ||
| } | ||
|
|
||
| @Override | ||
| public int limit() { | ||
| return request.limit(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.