You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2015/02/17 18:11:23 UTC
[14/18] storm git commit: Merge branch 'master' of
github.com:apache/incubator-storm into thrift092
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
index 1337697,ce03d91..100da84
--- a/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NotAliveException.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class NotAliveException extends Exception implements org.apache.thrift.TBase<NotAliveException, NotAliveException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+public class NotAliveException extends TException implements org.apache.thrift.TBase<NotAliveException, NotAliveException._Fields>, java.io.Serializable, Cloneable, Comparable<NotAliveException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotAliveException");
private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/NullStruct.java
index c72112e,960c3b2..f44bccd
--- a/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NullStruct.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruct._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+public class NullStruct implements org.apache.thrift.TBase<NullStruct, NullStruct._Fields>, java.io.Serializable, Cloneable, Comparable<NullStruct> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NullStruct");
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/NumErrorsChoice.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/NumErrorsChoice.java
index 0000000,b0548b0..8da6671
mode 000000,100644..100644
--- a/storm-core/src/jvm/backtype/storm/generated/NumErrorsChoice.java
+++ b/storm-core/src/jvm/backtype/storm/generated/NumErrorsChoice.java
@@@ -1,0 -1,64 +1,65 @@@
+ /**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ /**
- * Autogenerated by Thrift Compiler (0.7.0)
++ * Autogenerated by Thrift Compiler (0.9.2)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
++ * @generated
+ */
+ package backtype.storm.generated;
+
+
+ import java.util.Map;
+ import java.util.HashMap;
+ import org.apache.thrift.TEnum;
+
+ public enum NumErrorsChoice implements org.apache.thrift.TEnum {
+ ALL(0),
+ NONE(1),
+ ONE(2);
+
+ private final int value;
+
+ private NumErrorsChoice(int value) {
+ this.value = value;
+ }
+
+ /**
+ * Get the integer value of this enum value, as defined in the Thrift IDL.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * Find a the enum type by its integer value, as defined in the Thrift IDL.
+ * @return null if the value is not found.
+ */
+ public static NumErrorsChoice findByValue(int value) {
+ switch (value) {
+ case 0:
+ return ALL;
+ case 1:
+ return NONE;
+ case 2:
+ return ONE;
+ default:
+ return null;
+ }
+ }
+ }
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
index 690428d,9f3cbf1..f973ffc
--- a/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/RebalanceOptions.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOptions, RebalanceOptions._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+public class RebalanceOptions implements org.apache.thrift.TBase<RebalanceOptions, RebalanceOptions._Fields>, java.io.Serializable, Cloneable, Comparable<RebalanceOptions> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RebalanceOptions");
private static final org.apache.thrift.protocol.TField WAIT_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("wait_secs", org.apache.thrift.protocol.TType.I32, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
index 083294c,6390d5a..27303f1
--- a/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ShellComponent.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, ShellComponent._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+public class ShellComponent implements org.apache.thrift.TBase<ShellComponent, ShellComponent._Fields>, java.io.Serializable, Cloneable, Comparable<ShellComponent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ShellComponent");
private static final org.apache.thrift.protocol.TField EXECUTION_COMMAND_FIELD_DESC = new org.apache.thrift.protocol.TField("execution_command", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
index 16931ac,60028e7..42fd37b
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutSpec.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+public class SpoutSpec implements org.apache.thrift.TBase<SpoutSpec, SpoutSpec._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutSpec> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutSpec");
private static final org.apache.thrift.protocol.TField SPOUT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("spout_object", org.apache.thrift.protocol.TType.STRUCT, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
index e03cfdc,284f827..7826fe4
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutStats.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStats._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+public class SpoutStats implements org.apache.thrift.TBase<SpoutStats, SpoutStats._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutStats> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutStats");
private static final org.apache.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("acked", org.apache.thrift.protocol.TType.MAP, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
index f721a14,d89f0fb..15d34ae
--- a/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StateSpoutSpec.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, StateSpoutSpec._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+public class StateSpoutSpec implements org.apache.thrift.TBase<StateSpoutSpec, StateSpoutSpec._Fields>, java.io.Serializable, Cloneable, Comparable<StateSpoutSpec> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StateSpoutSpec");
private static final org.apache.thrift.protocol.TField STATE_SPOUT_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("state_spout_object", org.apache.thrift.protocol.TType.STRUCT, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/StormTopology.java
index 6da8287,1ec2b99..d022e95
--- a/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StormTopology.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class StormTopology implements org.apache.thrift.TBase<StormTopology, StormTopology._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+public class StormTopology implements org.apache.thrift.TBase<StormTopology, StormTopology._Fields>, java.io.Serializable, Cloneable, Comparable<StormTopology> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StormTopology");
private static final org.apache.thrift.protocol.TField SPOUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("spouts", org.apache.thrift.protocol.TType.MAP, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
index 18339c0,7cd9bb8..b9bc75d
--- a/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/StreamInfo.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInfo._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+public class StreamInfo implements org.apache.thrift.TBase<StreamInfo, StreamInfo._Fields>, java.io.Serializable, Cloneable, Comparable<StreamInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StreamInfo");
private static final org.apache.thrift.protocol.TField OUTPUT_FIELDS_FIELD_DESC = new org.apache.thrift.protocol.TField("output_fields", org.apache.thrift.protocol.TType.LIST, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
index 4c2e310,f885f69..2a68c3b
--- a/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SubmitOptions.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, SubmitOptions._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+public class SubmitOptions implements org.apache.thrift.TBase<SubmitOptions, SubmitOptions._Fields>, java.io.Serializable, Cloneable, Comparable<SubmitOptions> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SubmitOptions");
private static final org.apache.thrift.protocol.TField INITIAL_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("initial_status", org.apache.thrift.protocol.TType.I32, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
index 69fca27,7072cdd..bc81586
--- a/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SupervisorSummary.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSummary, SupervisorSummary._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+public class SupervisorSummary implements org.apache.thrift.TBase<SupervisorSummary, SupervisorSummary._Fields>, java.io.Serializable, Cloneable, Comparable<SupervisorSummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SupervisorSummary");
private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
index 3a9b407,2c36d4e..6e1a503
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, TopologyInfo._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+public class TopologyInfo implements org.apache.thrift.TBase<TopologyInfo, TopologyInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyInfo");
private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
index d129889,fea2137..bd8f90e
--- a/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
@@@ -50,9 -38,7 +50,9 @@@ import javax.annotation.Generated
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TopologySummary implements org.apache.thrift.TBase<TopologySummary, TopologySummary._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
- @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
++@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-6")
+public class TopologySummary implements org.apache.thrift.TBase<TopologySummary, TopologySummary._Fields>, java.io.Serializable, Cloneable, Comparable<TopologySummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologySummary");
private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/py/storm/DistributedRPC-remote
----------------------------------------------------------------------
diff --cc storm-core/src/py/storm/DistributedRPC-remote
index 3d06d07,41f8e72..3d06d07
mode 100755,100644..100644
--- a/storm-core/src/py/storm/DistributedRPC-remote
+++ b/storm-core/src/py/storm/DistributedRPC-remote
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/py/storm/DistributedRPCInvocations-remote
----------------------------------------------------------------------
diff --cc storm-core/src/py/storm/DistributedRPCInvocations-remote
index 9dd50cd,37f0cb5..9dd50cd
mode 100755,100644..100644
--- a/storm-core/src/py/storm/DistributedRPCInvocations-remote
+++ b/storm-core/src/py/storm/DistributedRPCInvocations-remote
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/py/storm/Nimbus-remote
----------------------------------------------------------------------
diff --cc storm-core/src/py/storm/Nimbus-remote
index 4e487c9,2e5e41a..9af5ead
mode 100755,100644..100755
--- a/storm-core/src/py/storm/Nimbus-remote
+++ b/storm-core/src/py/storm/Nimbus-remote
@@@ -34,34 -31,35 +34,35 @@@ from thrift.transport import TSSLSocke
from thrift.transport import THttpClient
from thrift.protocol import TBinaryProtocol
-import Nimbus
-from ttypes import *
+from storm import Nimbus
+from storm.ttypes import *
if len(sys.argv) <= 1 or sys.argv[1] == '--help':
- print ''
- print 'Usage: ' + sys.argv[0] + ' [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]'
- print ''
- print 'Functions:'
- print ' void submitTopology(string name, string uploadedJarLocation, string jsonConf, StormTopology topology)'
- print ' void submitTopologyWithOpts(string name, string uploadedJarLocation, string jsonConf, StormTopology topology, SubmitOptions options)'
- print ' void killTopology(string name)'
- print ' void killTopologyWithOpts(string name, KillOptions options)'
- print ' void activate(string name)'
- print ' void deactivate(string name)'
- print ' void rebalance(string name, RebalanceOptions options)'
- print ' void uploadNewCredentials(string name, Credentials creds)'
- print ' string beginFileUpload()'
- print ' void uploadChunk(string location, string chunk)'
- print ' void finishFileUpload(string location)'
- print ' string beginFileDownload(string file)'
- print ' string downloadChunk(string id)'
- print ' string getNimbusConf()'
- print ' ClusterSummary getClusterInfo()'
- print ' TopologyInfo getTopologyInfo(string id)'
- print ' TopologyInfo getTopologyInfoWithOpts(string id, GetInfoOptions options)'
- print ' string getTopologyConf(string id)'
- print ' StormTopology getTopology(string id)'
- print ' StormTopology getUserTopology(string id)'
- print ''
+ print('')
+ print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] [-s[sl]] function [arg1 [arg2...]]')
+ print('')
+ print('Functions:')
+ print(' void submitTopology(string name, string uploadedJarLocation, string jsonConf, StormTopology topology)')
+ print(' void submitTopologyWithOpts(string name, string uploadedJarLocation, string jsonConf, StormTopology topology, SubmitOptions options)')
+ print(' void killTopology(string name)')
+ print(' void killTopologyWithOpts(string name, KillOptions options)')
+ print(' void activate(string name)')
+ print(' void deactivate(string name)')
+ print(' void rebalance(string name, RebalanceOptions options)')
+ print(' void uploadNewCredentials(string name, Credentials creds)')
+ print(' string beginFileUpload()')
+ print(' void uploadChunk(string location, string chunk)')
+ print(' void finishFileUpload(string location)')
+ print(' string beginFileDownload(string file)')
+ print(' string downloadChunk(string id)')
+ print(' string getNimbusConf()')
+ print(' ClusterSummary getClusterInfo()')
+ print(' TopologyInfo getTopologyInfo(string id)')
++ print(' TopologyInfo getTopologyInfoWithOpts(string id, GetInfoOptions options)')
+ print(' string getTopologyConf(string id)')
+ print(' StormTopology getTopology(string id)')
+ print(' StormTopology getUserTopology(string id)')
+ print('')
sys.exit(0)
pp = pprint.PrettyPrinter(indent = 2)
@@@ -213,9 -205,15 +214,15 @@@ elif cmd == 'getTopologyInfo'
sys.exit(1)
pp.pprint(client.getTopologyInfo(args[0],))
+ elif cmd == 'getTopologyInfoWithOpts':
+ if len(args) != 2:
- print 'getTopologyInfoWithOpts requires 2 args'
++ print('getTopologyInfoWithOpts requires 2 args')
+ sys.exit(1)
+ pp.pprint(client.getTopologyInfoWithOpts(args[0],eval(args[1]),))
+
elif cmd == 'getTopologyConf':
if len(args) != 1:
- print 'getTopologyConf requires 1 args'
+ print('getTopologyConf requires 1 args')
sys.exit(1)
pp.pprint(client.getTopologyConf(args[0],))
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/py/storm/Nimbus.py
----------------------------------------------------------------------
diff --cc storm-core/src/py/storm/Nimbus.py
index 6159ad7,271780b..38e137d
--- a/storm-core/src/py/storm/Nimbus.py
+++ b/storm-core/src/py/storm/Nimbus.py
@@@ -715,6 -705,42 +723,43 @@@ class Client(Iface)
raise result.aze
raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopologyInfo failed: unknown result");
+ def getTopologyInfoWithOpts(self, id, options):
+ """
+ Parameters:
+ - id
+ - options
+ """
+ self.send_getTopologyInfoWithOpts(id, options)
+ return self.recv_getTopologyInfoWithOpts()
+
+ def send_getTopologyInfoWithOpts(self, id, options):
+ self._oprot.writeMessageBegin('getTopologyInfoWithOpts', TMessageType.CALL, self._seqid)
+ args = getTopologyInfoWithOpts_args()
+ args.id = id
+ args.options = options
+ args.write(self._oprot)
+ self._oprot.writeMessageEnd()
+ self._oprot.trans.flush()
+
- def recv_getTopologyInfoWithOpts(self, ):
- (fname, mtype, rseqid) = self._iprot.readMessageBegin()
++ def recv_getTopologyInfoWithOpts(self):
++ iprot = self._iprot
++ (fname, mtype, rseqid) = iprot.readMessageBegin()
+ if mtype == TMessageType.EXCEPTION:
+ x = TApplicationException()
- x.read(self._iprot)
- self._iprot.readMessageEnd()
++ x.read(iprot)
++ iprot.readMessageEnd()
+ raise x
+ result = getTopologyInfoWithOpts_result()
- result.read(self._iprot)
- self._iprot.readMessageEnd()
++ result.read(iprot)
++ iprot.readMessageEnd()
+ if result.success is not None:
+ return result.success
+ if result.e is not None:
+ raise result.e
+ if result.aze is not None:
+ raise result.aze
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getTopologyInfoWithOpts failed: unknown result");
+
def getTopologyConf(self, id):
"""
Parameters:
@@@ -3604,6 -3553,171 +3666,178 @@@ class getTopologyInfo_result
def __ne__(self, other):
return not (self == other)
+
+ class getTopologyInfoWithOpts_args:
+ """
+ Attributes:
+ - id
+ - options
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRING, 'id', None, None, ), # 1
+ (2, TType.STRUCT, 'options', (GetInfoOptions, GetInfoOptions.thrift_spec), None, ), # 2
+ )
+
- def __hash__(self):
- return 0 + hash(self.id) + hash(self.options)
-
+ def __init__(self, id=None, options=None,):
+ self.id = id
+ self.options = options
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRING:
+ self.id = iprot.readString().decode('utf-8')
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRUCT:
+ self.options = GetInfoOptions()
+ self.options.read(iprot)
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('getTopologyInfoWithOpts_args')
+ if self.id is not None:
+ oprot.writeFieldBegin('id', TType.STRING, 1)
+ oprot.writeString(self.id.encode('utf-8'))
+ oprot.writeFieldEnd()
+ if self.options is not None:
+ oprot.writeFieldBegin('options', TType.STRUCT, 2)
+ self.options.write(oprot)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ return
+
+
++ def __hash__(self):
++ value = 17
++ value = (value * 31) ^ hash(self.id)
++ value = (value * 31) ^ hash(self.options)
++ return value
++
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+ class getTopologyInfoWithOpts_result:
+ """
+ Attributes:
+ - success
+ - e
+ - aze
+ """
+
+ thrift_spec = (
+ (0, TType.STRUCT, 'success', (TopologyInfo, TopologyInfo.thrift_spec), None, ), # 0
+ (1, TType.STRUCT, 'e', (NotAliveException, NotAliveException.thrift_spec), None, ), # 1
+ (2, TType.STRUCT, 'aze', (AuthorizationException, AuthorizationException.thrift_spec), None, ), # 2
+ )
+
- def __hash__(self):
- return 0 + hash(self.success) + hash(self.e) + hash(self.aze)
-
+ def __init__(self, success=None, e=None, aze=None,):
+ self.success = success
+ self.e = e
+ self.aze = aze
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 0:
+ if ftype == TType.STRUCT:
+ self.success = TopologyInfo()
+ self.success.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 1:
+ if ftype == TType.STRUCT:
+ self.e = NotAliveException()
+ self.e.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRUCT:
+ self.aze = AuthorizationException()
+ self.aze.read(iprot)
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('getTopologyInfoWithOpts_result')
+ if self.success is not None:
+ oprot.writeFieldBegin('success', TType.STRUCT, 0)
+ self.success.write(oprot)
+ oprot.writeFieldEnd()
+ if self.e is not None:
+ oprot.writeFieldBegin('e', TType.STRUCT, 1)
+ self.e.write(oprot)
+ oprot.writeFieldEnd()
+ if self.aze is not None:
+ oprot.writeFieldBegin('aze', TType.STRUCT, 2)
+ self.aze.write(oprot)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ return
+
+
++ def __hash__(self):
++ value = 17
++ value = (value * 31) ^ hash(self.success)
++ value = (value * 31) ^ hash(self.e)
++ value = (value * 31) ^ hash(self.aze)
++ return value
++
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
class getTopologyConf_args:
"""
http://git-wip-us.apache.org/repos/asf/storm/blob/a99e1276/storm-core/src/py/storm/ttypes.py
----------------------------------------------------------------------
diff --cc storm-core/src/py/storm/ttypes.py
index 58af972,46e7a92..8c3f5e6
--- a/storm-core/src/py/storm/ttypes.py
+++ b/storm-core/src/py/storm/ttypes.py
@@@ -4516,6 -4400,69 +4533,71 @@@ class SubmitOptions
def __ne__(self, other):
return not (self == other)
+ class GetInfoOptions:
+ """
+ Attributes:
+ - num_err_choice
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.I32, 'num_err_choice', None, None, ), # 1
+ )
+
- def __hash__(self):
- return 0 + hash(self.num_err_choice)
-
+ def __init__(self, num_err_choice=None,):
+ self.num_err_choice = num_err_choice
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.I32:
+ self.num_err_choice = iprot.readI32();
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('GetInfoOptions')
+ if self.num_err_choice is not None:
+ oprot.writeFieldBegin('num_err_choice', TType.I32, 1)
+ oprot.writeI32(self.num_err_choice)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ return
+
+
++ def __hash__(self):
++ value = 17
++ value = (value * 31) ^ hash(self.num_err_choice)
++ return value
++
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
class DRPCRequest:
"""
Attributes: