flink-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From StephanEwen <...@git.apache.org>
Subject [GitHub] flink pull request #3143: [FLINK-5530] fix race condition in AbstractRocksDB...
Date Wed, 18 Jan 2017 11:25:35 GMT
Github user StephanEwen commented on a diff in the pull request:

    https://github.com/apache/flink/pull/3143#discussion_r96613474
  
    --- Diff: flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/AbstractRocksDBState.java
---
    @@ -132,55 +132,95 @@ public void setCurrentNamespace(N namespace) {
     				namespaceSerializer);
     
     		int keyGroup = KeyGroupRangeAssignment.assignToKeyGroup(des.f0, backend.getNumberOfKeyGroups());
    -		writeKeyWithGroupAndNamespace(keyGroup, des.f0, des.f1);
    -		return backend.db.get(columnFamily, keySerializationStream.toByteArray());
    +
    +		// we cannot reuse the keySerializationStream member since this method
    +		// is called concurrently to the other ones and it may thus contain garbage
    +		ByteArrayOutputStreamWithPos tmpKeySerializationStream =
    +			new ByteArrayOutputStreamWithPos(128);
    +		DataOutputViewStreamWrapper tmpKeySerializationDateDataOutputView =
    +			new DataOutputViewStreamWrapper(tmpKeySerializationStream);
    +
    +		writeKeyWithGroupAndNamespace(keyGroup, des.f0, des.f1,
    +			tmpKeySerializationStream, tmpKeySerializationDateDataOutputView);
    +
    +		return backend.db.get(columnFamily, tmpKeySerializationStream.toByteArray());
     
     	}
     
     	protected void writeCurrentKeyWithGroupAndNamespace() throws IOException {
    -		writeKeyWithGroupAndNamespace(backend.getCurrentKeyGroupIndex(), backend.getCurrentKey(),
currentNamespace);
    +		writeKeyWithGroupAndNamespace(
    +			backend.getCurrentKeyGroupIndex(),
    +			backend.getCurrentKey(),
    +			currentNamespace,
    +			this.keySerializationStream,
    +			this.keySerializationDateDataOutputView);
     	}
     
    -	protected void writeKeyWithGroupAndNamespace(int keyGroup, K key, N namespace) throws
IOException {
    +	protected void writeKeyWithGroupAndNamespace(int keyGroup, K key,
    +		N namespace,
    --- End diff --
    
    Just my personal opinion, but indenting parameters differently than the method body helps
readability (say two indentations for the parameter list).


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message