Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/864
Change subject: WIP: TESTING GERRIT SONARQUBE REVIEWS
......................................................................
WIP: TESTING GERRIT SONARQUBE REVIEWS
Do not review.
Change-Id: Id5742e30fc90266d29354f2f092b021f95ec85ff
---
M
asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java
M
asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeControllersInfoWork.java
M
hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
4 files changed, 19 insertions(+), 14 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/64/864/1
diff --git
a/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java
b/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java
index f823404..f8355d0 100644
---
a/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java
+++
b/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/ClusterStateWatcher.java
@@ -35,14 +35,13 @@
private static Logger LOGGER =
Logger.getLogger(ClusterStateWatcher.class.getName());
public ClusterStateWatcher(ZooKeeper zk, String clusterName) {
- this.clusterStatePath = ZooKeeperService.ASTERIX_INSTANCE_BASE_PATH +
File.separator + clusterName
- + ZooKeeperService.ASTERIX_INSTANCE_STATE_PATH;
- this.zk = zk;
+ this.clusterStatePath =
ZooKeeperService.ASTERIX_INSTANCE_BASE_PATH + File.separator + clusterName +
ZooKeeperService.ASTERIX_INSTANCE_STATE_PATH;
+ this.zk = zk;
}
public ClusterState waitForClusterStart() throws Exception {
while (true) {
- synchronized (mutex) {
+ synchronized (mutex) {
if (done) {
if (failed) {
LOGGER.error("An error took place in the startup
sequence. Check the CC logs.");
diff --git
a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java
b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java
index d604f35..4d5c4a4 100644
---
a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java
+++
b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java
@@ -126,6 +126,7 @@
public enum SpatialFilterKind {
SI
}
+ public static final String fooBAR = "yeah this line is like way too long,
but i just need to see how existing failures will be reported.";
private static final FunctionInfoRepository registeredFunctions = new
FunctionInfoRepository();
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeControllersInfoWork.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeControllersInfoWork.java
index 785a202..2125ca0 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeControllersInfoWork.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetNodeControllersInfoWork.java
@@ -29,6 +29,7 @@
import org.apache.hyracks.control.common.work.IResultCallback;
public class GetNodeControllersInfoWork extends AbstractWork {
+ private final Integer mutex = new Integer(-1);
private final ClusterControllerService ccs;
private IResultCallback<Map<String, NodeControllerInfo>> callback;
@@ -40,12 +41,14 @@
@Override
public void run() {
- Map<String, NodeControllerInfo> result = new LinkedHashMap<String,
NodeControllerInfo>();
- Map<String, NodeControllerState> nodeMap = ccs.getNodeMap();
- for (Map.Entry<String, NodeControllerState> e : nodeMap.entrySet()) {
- result.put(e.getKey(), new NodeControllerInfo(e.getKey(),
NodeStatus.ALIVE, e.getValue().getDataPort(), e
- .getValue().getDatasetPort()));
+ synchronized(mutex) {
+ Map<String, NodeControllerInfo> result = new LinkedHashMap<String,
NodeControllerInfo>();
+ Map<String, NodeControllerState> nodeMap = ccs.getNodeMap();
+ for (Map.Entry<String, NodeControllerState> e :
nodeMap.entrySet()) {
+ result.put(e.getKey(), new NodeControllerInfo(e.getKey(),
NodeStatus.ALIVE, e.getValue().getDataPort(), e
+ .getValue().getDatasetPort()));
+ }
+ callback.setValue(result);
}
- callback.setValue(result);
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
index 0a9343e..7bcf576 100644
---
a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
+++
b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
@@ -55,6 +55,8 @@
@SuppressWarnings("rawtypes")
public abstract class OrderedIndexExamplesTest {
+ public static final String fooBAR = "yeah this line is like way too long,
but i just need to see how existing failures will be reported.";
+
protected static final Logger LOGGER =
Logger.getLogger(OrderedIndexExamplesTest.class.getName());
protected final Random rnd = new Random(50);
@@ -326,14 +328,14 @@
ISerializerDeserializer[] fieldSerdes = { new
UTF8StringSerializerDeserializer(),
new UTF8StringSerializerDeserializer() };
- // Declare keys.
+ // Declare keys.
int keyFieldCount = 1;
IBinaryComparatorFactory[] cmpFactories = new
IBinaryComparatorFactory[keyFieldCount];
cmpFactories[0] =
PointableBinaryComparatorFactory.of(UTF8StringPointable.FACTORY);
- // This is only used for the LSM-BTree.
- int[] bloomFilterKeyFields = new int[keyFieldCount];
- bloomFilterKeyFields[0] = 0;
+ // This is only used for the LSM-BTree.
+ int[] bloomFilterKeyFields = new int[keyFieldCount];
+ bloomFilterKeyFields[0] = 0;
ITreeIndex treeIndex = createTreeIndex(typeTraits, cmpFactories,
bloomFilterKeyFields, null, null, null, null);
treeIndex.create();
--
To view, visit https://asterix-gerrit.ics.uci.edu/864
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5742e30fc90266d29354f2f092b021f95ec85ff
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <[email protected]>
