You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/05/15 18:05:47 UTC
[1/2] storm git commit: Merge branch 'STORM-2511' of
https://github.com/satishd/storm into STORM-2511
Repository: storm
Updated Branches:
refs/heads/1.x-branch c2950e490 -> aa6a559e6
Merge branch 'STORM-2511' of https://github.com/satishd/storm into STORM-2511
STORM-2511: Submitting a topology with name containing unicode getting
failed
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/24437acc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/24437acc
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/24437acc
Branch: refs/heads/1.x-branch
Commit: 24437acc57235d29ef8e9632f678c9c53f7ff7d4
Parents: c2950e4
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon May 15 12:27:52 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon May 15 12:43:06 2017 -0500
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/blobstore/BlobStore.java | 2 +-
.../jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/24437acc/storm-core/src/jvm/org/apache/storm/blobstore/BlobStore.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/blobstore/BlobStore.java b/storm-core/src/jvm/org/apache/storm/blobstore/BlobStore.java
index 14879b4..92f32ec 100644
--- a/storm-core/src/jvm/org/apache/storm/blobstore/BlobStore.java
+++ b/storm-core/src/jvm/org/apache/storm/blobstore/BlobStore.java
@@ -61,7 +61,7 @@ import org.apache.storm.generated.SettableBlobMeta;
*/
public abstract class BlobStore implements Shutdownable {
private static final Logger LOG = LoggerFactory.getLogger(BlobStore.class);
- private static final Pattern KEY_PATTERN = Pattern.compile("^[\\w \\t\\.:_-]+$");
+ private static final Pattern KEY_PATTERN = Pattern.compile("^[\\w \\t\\.:_-]+$", Pattern.UNICODE_CHARACTER_CLASS);
protected static final String BASE_BLOBS_DIR_NAME = "blobs";
/**
http://git-wip-us.apache.org/repos/asf/storm/blob/24437acc/storm-core/test/jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java b/storm-core/test/jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java
index 742c917..448a381 100644
--- a/storm-core/test/jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java
+++ b/storm-core/test/jvm/org/apache/storm/blobstore/ClientBlobStoreTest.java
@@ -164,6 +164,12 @@ public class ClientBlobStoreTest {
validatedBlobAcls(testKey);
}
+ @Test
+ public void testBloblStoreKeyWithUnicodesValidation() throws Exception {
+ BlobStore.validateKey("msg:kafka-unicodewriter䶵-11-1483434711-stormconf.ser");
+ BlobStore.validateKey("msg:kafka-ascii-11-148343436363-stormconf.ser");
+ }
+
private void createTestBlob(String testKey, SettableBlobMeta meta) throws AuthorizationException, KeyAlreadyExistsException {
AccessControl submitterAcl = BlobStoreAclHandler.parseAccessControl("u:tester:rwa");
meta.add_to_acl(submitterAcl);
[2/2] storm git commit: Added STORM-2511 to Changelog
Posted by bo...@apache.org.
Added STORM-2511 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/aa6a559e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aa6a559e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aa6a559e
Branch: refs/heads/1.x-branch
Commit: aa6a559e6731051b36101d53213358ef6b6fa794
Parents: 24437ac
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon May 15 13:05:05 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon May 15 13:05:05 2017 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/aa6a559e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 662c191..a6ed043 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.1.1
+ * STORM-2511: Submitting a topology with name containing unicode getting failed
* STORM-2496: Dependency artifacts should be uploaded to blobstore with READ permission for all
* STORM-2512: Make constructor public and add one more builder constructor
* STORM-2505: Spout to support topic compaction