Browse Source

Remove old QuickProto-based Echo sample.

Tim Burks 9 years ago
parent
commit
285457c041

+ 0 - 9
Samples/Echo-QuickProto/EchoClient/Makefile

@@ -1,9 +0,0 @@
-LIBDIR = /usr/local/lib
-INCDIR = /usr/local/include
-
-all:
-	swift build -Xlinker -L$(LIBDIR) -Xlinker -lgrpc -Xcc -I$(INCDIR)
-
-clean :
-	rm -rf Packages
-	rm -rf .build

+ 0 - 39
Samples/Echo-QuickProto/EchoClient/Package.swift

@@ -1,39 +0,0 @@
-/*
- *
- * Copyright 2016, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-import PackageDescription
-let package = Package (
-    name: "EchoClient",
-    dependencies: [
-        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,0)),
-    ]
-)

BIN
Samples/Echo-QuickProto/EchoClient/echo.out


+ 0 - 89
Samples/Echo-QuickProto/EchoClient/main.swift

@@ -1,89 +0,0 @@
-/*
- *
- * Copyright 2016, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-import Foundation
-import gRPC
-import QuickProto
-
-let address = "localhost:8001"
-
-gRPC.initialize()
-
-guard let fileDescriptorSetProto = NSData(contentsOfFile:"echo.out")
-  else {
-    print("Missing echo.out")
-    exit(-1)
-}
-
-let fileDescriptorSet = FileDescriptorSet(data:Data(bytes:fileDescriptorSetProto.bytes,
-                                                          count:fileDescriptorSetProto.length))
-
-let requestMethod = "/echo.Echo/Get"
-
-if let requestMessage = fileDescriptorSet.makeMessage("EchoRequest") {
-  requestMessage.addField("text", value:"hello, swifty!")
-  let requestMessageData = requestMessage.data()
-  let requestMetadata = Metadata()
-
-  let channel = Channel(address:address)
-  let call = channel.makeCall(requestMethod)
-
-  let done = NSCondition()
-  do {
-    print("Calling echo service")
-    try call.perform(message:requestMessageData,
-                     metadata:requestMetadata)
-    {(response) in
-      print("Received status: \(response.statusCode) " + response.statusMessage!)
-      // unpack and process message
-      if let responseData = response.resultData,
-        let responseMessage = fileDescriptorSet.readMessage("EchoResponse", data:responseData) {
-        try responseMessage.forOneField("text") {(field) in
-          print(field.string())
-        }
-      } else {
-        print("No message received. gRPC Status \(response.statusCode) " + response.statusMessage!)
-      }
-      done.lock()
-      done.signal()
-      done.unlock()
-    }
-  } catch let error {
-    print("\(error)")
-    done.lock()
-    done.signal()
-    done.unlock()
-  }
-  done.lock()
-  done.wait()
-  done.unlock()
-}

+ 0 - 9
Samples/Echo-QuickProto/EchoServer/Makefile

@@ -1,9 +0,0 @@
-LIBDIR = /usr/local/lib
-INCDIR = /usr/local/include
-
-all:
-	swift build -Xlinker -L$(LIBDIR) -Xlinker -lgrpc -Xcc -I$(INCDIR)
-
-clean :
-	rm -rf Packages
-	rm -rf .build

+ 0 - 39
Samples/Echo-QuickProto/EchoServer/Package.swift

@@ -1,39 +0,0 @@
-/*
- *
- * Copyright 2016, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-import PackageDescription
-let package = Package (
-    name: "EchoServer",
-    dependencies: [
-        .Package(url: "https://github.com/grpc/grpc-swift.git", Version(0,1,0)),
-    ]
-)

BIN
Samples/Echo-QuickProto/EchoServer/echo.out


+ 0 - 101
Samples/Echo-QuickProto/EchoServer/main.swift

@@ -1,101 +0,0 @@
-/*
- *
- * Copyright 2016, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-import Foundation
-import gRPC
-import QuickProto
-
-let address = "localhost:8001"
-
-gRPC.initialize()
-
-guard let fileDescriptorSetProto = NSData(contentsOfFile:"echo.out")
-  else {
-    print("Missing echo.out")
-    exit(-1)
-}
-
-let fileDescriptorSet = FileDescriptorSet(data:Data(bytes:fileDescriptorSetProto.bytes,
-                                                    count:fileDescriptorSetProto.length))
-
-print("Server Starting")
-print("GRPC version " + gRPC.version())
-var requestCount = 0
-
-let server = gRPC.Server(address:address)
-let done = NSCondition()
-server.run() {(requestHandler) in
-  do {
-    requestCount += 1
-
-    print("\(requestCount): Received request " + requestHandler.host
-      + " " + requestHandler.method
-      + " from " + requestHandler.caller)
-
-    let initialMetadata = requestHandler.requestMetadata
-    for i in 0..<initialMetadata.count() {
-      print("\(requestCount): Received initial metadata -> " + initialMetadata.key(index:i)
-        + ":" + initialMetadata.value(index:i))
-    }
-
-    let initialMetadataToSend = Metadata([["a": "Apple"],
-                                          ["b": "Banana"],
-                                          ["c": "Cherry"]])
-    try requestHandler.receiveMessage(initialMetadata:initialMetadataToSend)
-    {(messageData) in
-      if let requestMessage = fileDescriptorSet.readMessage("EchoRequest", data:messageData!) {
-        try requestMessage.forOneField("text") {(field) in
-
-          let replyMessage = fileDescriptorSet.makeMessage("EchoResponse")!
-          replyMessage.addField("text", value:field.string())
-
-          try requestHandler.sendResponse(message:replyMessage.data(),
-                                           statusCode:0,
-                                           statusMessage:"OK",
-                                           trailingMetadata:Metadata())
-        }
-      }
-    }
-  } catch (let callError) {
-    Swift.print("call error \(callError)")
-  }
-}
-
-print("Waiting")
-
-// we never actually exit the server; kill the process to stop it.
-done.lock()
-done.wait()
-done.unlock()
-
-print("Done")
-

+ 3 - 4
Samples/README.md

@@ -67,14 +67,13 @@ Start a docker instance with the following command:
     cd grpc-swift/Samples
     cd Simple/SimpleServer; make; cd ../..
     cd Simple/SimpleClient; make; cd ../..
-    cd Echo-QuickProto/EchoServer; make; cd ../..
-    cd Echo-QuickProto/EchoClient; make; cd ../..
+    cd Echo; make; cd ../..
 
 ## Run the test client and server from the grpc/src/swift/Packages directory:
     Simple/SimpleServer/.build/debug/SimpleServer &
     Simple/SimpleClient/.build/debug/SimpleClient	
 or	
 
-    Echo-QuickProto/EchoServer/.build/debug/EchoServer &
-    Echo-QuickProto/EchoClient/.build/debug/EchoClient
+    Echo/.build/debug/Echo serve &
+    Echo/.build/debug/Echo get
 	

BIN
Samples/echo.out