Yingyi Bu has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1817
Change subject: rename TaskUtil.getInSharedMap(..) -> TaskUtil.get(..).
......................................................................
rename TaskUtil.getInSharedMap(..) -> TaskUtil.get(..).
Change-Id: Ic795c988ca63db7c760a2c8e7638451945cb72aa
---
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ConnectorDescriptorWithMessagingTest.java
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/LSMInsertDeleteOperatorNodePushable.java
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedIntakeOperatorNodePushable.java
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaComputeNodePushable.java
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/operators/FeedMetaStoreNodePushable.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
M
hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/utils/TaskUtil.java
9 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/17/1817/1
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 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);
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 @@
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 @@
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 @@
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 @@
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();
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 @@
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();
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 @@
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 =
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 @@
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.
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 @@
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;
}
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 @@
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;
}
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 @@
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();
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 @@
* @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);
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/1817
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic795c988ca63db7c760a2c8e7638451945cb72aa
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <[email protected]>
