Repository: asterixdb Updated Branches: refs/heads/master 81799ab0f -> 1bba5bc67
Rename TaskUtil.getInSharedMap(..) -> TaskUtil.get(..). Change-Id: Ic795c988ca63db7c760a2c8e7638451945cb72aa Reviewed-on: https://asterix-gerrit.ics.uci.edu/1817 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> BAD: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/1bba5bc6 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/1bba5bc6 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/1bba5bc6 Branch: refs/heads/master Commit: 1bba5bc677eeb96f628dff6a4be7994449982275 Parents: 81799ab Author: Yingyi Bu <[email protected]> Authored: Thu Jun 8 16:50:50 2017 -0700 Committer: Yingyi Bu <[email protected]> Committed: Thu Jun 8 22:33:29 2017 -0700 ---------------------------------------------------------------------- .../org/apache/asterix/app/bootstrap/TestNodeController.java | 2 +- .../test/dataflow/ConnectorDescriptorWithMessagingTest.java | 8 ++++---- .../java/org/apache/asterix/test/dataflow/LogMarkerTest.java | 2 +- .../common/dataflow/LSMInsertDeleteOperatorNodePushable.java | 2 +- .../external/operators/FeedIntakeOperatorNodePushable.java | 2 +- .../external/operators/FeedMetaComputeNodePushable.java | 2 +- .../external/operators/FeedMetaStoreNodePushable.java | 2 +- .../operators/LSMPrimaryUpsertOperatorNodePushable.java | 2 +- .../org/apache/hyracks/dataflow/common/utils/TaskUtil.java | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1bba5bc6/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java index cbe551b..f99793a 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java @@ -312,7 +312,7 @@ public class TestNodeController { public IHyracksTaskContext createTestContext(boolean withMessaging) throws HyracksDataException { IHyracksTaskContext ctx = TestUtils.create(KB32); if (withMessaging) { - TaskUtil.putInSharedMap(HyracksConstants.KEY_MESSAGE, new VSizeFrame(ctx), ctx); + TaskUtil.put(HyracksConstants.KEY_MESSAGE, new VSizeFrame(ctx), ctx); } ctx = Mockito.spy(ctx); Mockito.when(ctx.getJobletContext()).thenReturn(jobletCtx); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1bba5bc6/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ConnectorDescriptorWithMessagingTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ConnectorDescriptorWithMessagingTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ConnectorDescriptorWithMessagingTest.java index 48ca338..b1c7ff3 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ConnectorDescriptorWithMessagingTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ConnectorDescriptorWithMessagingTest.java @@ -72,7 +72,7 @@ public class ConnectorDescriptorWithMessagingTest { IHyracksTaskContext ctx = TestUtils.create(DEFAULT_FRAME_SIZE); VSizeFrame message = new VSizeFrame(ctx); VSizeFrame tempBuffer = new VSizeFrame(ctx); - TaskUtil.putInSharedMap(HyracksConstants.KEY_MESSAGE, message, ctx); + TaskUtil.put(HyracksConstants.KEY_MESSAGE, message, ctx); message.getBuffer().clear(); message.getBuffer().put(MessagingFrameTupleAppender.NULL_FEED_MESSAGE); message.getBuffer().flip(); @@ -152,7 +152,7 @@ public class ConnectorDescriptorWithMessagingTest { IHyracksTaskContext ctx = TestUtils.create(DEFAULT_FRAME_SIZE); VSizeFrame message = new VSizeFrame(ctx); VSizeFrame tempBuffer = new VSizeFrame(ctx); - TaskUtil.putInSharedMap(HyracksConstants.KEY_MESSAGE, message, ctx); + TaskUtil.put(HyracksConstants.KEY_MESSAGE, message, ctx); writeRandomMessage(message, MessagingFrameTupleAppender.MARKER_MESSAGE, DEFAULT_FRAME_SIZE + 1); ISerializerDeserializer<?>[] serdes = new ISerializerDeserializer<?>[] { Integer64SerializerDeserializer.INSTANCE, DoubleSerializerDeserializer.INSTANCE, @@ -236,7 +236,7 @@ public class ConnectorDescriptorWithMessagingTest { IHyracksTaskContext ctx = TestUtils.create(DEFAULT_FRAME_SIZE); VSizeFrame message = new VSizeFrame(ctx); VSizeFrame tempBuffer = new VSizeFrame(ctx); - TaskUtil.putInSharedMap(HyracksConstants.KEY_MESSAGE, message, ctx); + TaskUtil.put(HyracksConstants.KEY_MESSAGE, message, ctx); message.getBuffer().clear(); writeRandomMessage(message, MessagingFrameTupleAppender.MARKER_MESSAGE, DEFAULT_FRAME_SIZE); ISerializerDeserializer<?>[] serdes = new ISerializerDeserializer<?>[] { @@ -294,7 +294,7 @@ public class ConnectorDescriptorWithMessagingTest { IHyracksTaskContext ctx = TestUtils.create(DEFAULT_FRAME_SIZE); VSizeFrame message = new VSizeFrame(ctx); VSizeFrame tempBuffer = new VSizeFrame(ctx); - TaskUtil.putInSharedMap(HyracksConstants.KEY_MESSAGE, message, ctx); + TaskUtil.put(HyracksConstants.KEY_MESSAGE, message, ctx); message.getBuffer().clear(); message.getBuffer().put(MessagingFrameTupleAppender.ACK_REQ_FEED_MESSAGE); message.getBuffer().flip(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1bba5bc6/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java index ef72c67..1e3960f 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java @@ -136,7 +136,7 @@ public class LogMarkerTest { marker.getBuffer().putLong(markerId); marker.getBuffer().flip(); markerId++; - TaskUtil.putInSharedMap(HyracksConstants.KEY_MESSAGE, marker, ctx); + TaskUtil.put(HyracksConstants.KEY_MESSAGE, marker, ctx); tupleAppender.flush(insertOp); } ITupleReference tuple = tupleGenerator.next(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1bba5bc6/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/LSMInsertDeleteOperatorNodePushable.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/LSMInsertDeleteOperatorNodePushable.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/LSMInsertDeleteOperatorNodePushable.java index 3f9fba9..1c610ac 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/LSMInsertDeleteOperatorNodePushable.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/LSMInsertDeleteOperatorNodePushable.java @@ -83,7 +83,7 @@ public class LSMInsertDeleteOperatorNodePushable extends LSMIndexInsertUpdateDel try { if (isPrimary && ctx.getSharedObject() != null) { PrimaryIndexLogMarkerCallback callback = new PrimaryIndexLogMarkerCallback(lsmIndex); - TaskUtil.putInSharedMap(ILogMarkerCallback.KEY_MARKER_CALLBACK, callback, ctx); + TaskUtil.put(ILogMarkerCallback.KEY_MARKER_CALLBACK, callback, ctx); } writer.open(); modCallback = http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1bba5bc6/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java index 8a7bda9..2876ea6 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java @@ -66,7 +66,7 @@ public class FeedIntakeOperatorNodePushable extends ActiveSourceOperatorNodePush FeedAdapter adapter = (FeedAdapter) adapterFactory.createAdapter(ctx, partition); adapterRuntimeManager = new AdapterRuntimeManager(ctx, runtimeId.getEntityId(), adapter, writer, partition); IFrame message = new VSizeFrame(ctx); - TaskUtil.putInSharedMap(HyracksConstants.KEY_MESSAGE, message, ctx); + TaskUtil.put(HyracksConstants.KEY_MESSAGE, message, ctx); /* * Set null feed message. Feed pipeline carries with it a message with each frame * Initially, the message is set to a null message that can be changed by feed adapters. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1bba5bc6/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaComputeNodePushable.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaComputeNodePushable.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaComputeNodePushable.java index 0558ead..24a7462 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaComputeNodePushable.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaComputeNodePushable.java @@ -106,7 +106,7 @@ public class FeedMetaComputeNodePushable extends AbstractUnaryInputUnaryOutputOp this.feedManager = (ActiveManager) ((INcApplicationContext) ctx.getJobletContext().getServiceContext() .getApplicationContext()).getActiveManager(); this.message = new VSizeFrame(ctx); - TaskUtil.putInSharedMap(HyracksConstants.KEY_MESSAGE, message, ctx); + TaskUtil.put(HyracksConstants.KEY_MESSAGE, message, ctx); this.opDesc = feedMetaOperatorDescriptor; this.recordDescProvider = recordDescProvider; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1bba5bc6/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaStoreNodePushable.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaStoreNodePushable.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaStoreNodePushable.java index 662b543..97c1115 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaStoreNodePushable.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaStoreNodePushable.java @@ -98,7 +98,7 @@ public class FeedMetaStoreNodePushable extends AbstractUnaryInputUnaryOutputOper this.feedManager = (ActiveManager) ((INcApplicationContext) ctx.getJobletContext().getServiceContext() .getApplicationContext()).getActiveManager(); this.message = new VSizeFrame(ctx); - TaskUtil.putInSharedMap(HyracksConstants.KEY_MESSAGE, message, ctx); + TaskUtil.put(HyracksConstants.KEY_MESSAGE, message, ctx); this.recordDescProvider = recordDescProvider; this.opDesc = feedMetaOperatorDescriptor; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1bba5bc6/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java index 0a11684..1f41c82 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java @@ -199,7 +199,7 @@ public class LSMPrimaryUpsertOperatorNodePushable extends LSMIndexInsertUpdateDe try { if (ctx.getSharedObject() != null) { PrimaryIndexLogMarkerCallback callback = new PrimaryIndexLogMarkerCallback((AbstractLSMIndex) index); - TaskUtil.putInSharedMap(ILogMarkerCallback.KEY_MARKER_CALLBACK, callback, ctx); + TaskUtil.put(ILogMarkerCallback.KEY_MARKER_CALLBACK, callback, ctx); } missingTupleBuilder = new ArrayTupleBuilder(1); DataOutput out = missingTupleBuilder.getDataOutput(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1bba5bc6/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/utils/TaskUtil.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/utils/TaskUtil.java b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/utils/TaskUtil.java index 4a2021f..75c95b0 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/utils/TaskUtil.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/utils/TaskUtil.java @@ -58,7 +58,7 @@ public class TaskUtil { * @param ctx * @param object */ - public static void putInSharedMap(String key, Object object, IHyracksTaskContext ctx) { + public static void put(String key, Object object, IHyracksTaskContext ctx) { TaskUtil.getSharedMap(ctx, true).put(key, object); }
