JSON schema roundtrip passing for many types

Change-Id: I70d02dcd2958217deb37296f280c0298d4f943a0

Author: wesm

cpp/CMakeLists.txt

@@ -694,7 +694,6 @@ set(ARROW_SRCS
   src/arrow/array.cc
   src/arrow/builder.cc
   src/arrow/column.cc
-  src/arrow/factory.cc
   src/arrow/schema.cc
   src/arrow/table.cc
   src/arrow/type.cc

cpp/src/arrow/factory.cc

@@ -15,29 +15,23 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include "arrow/ipc/json-internal.h"
+
 #include <cstdint>
 #include <cstdio>
 #include <cstring>
+#include <iostream>
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "rapidjson/document.h"
+#include "rapidjson/filewritestream.h"
+#include "rapidjson/prettywriter.h"
 #include "gtest/gtest.h"
 
-#include "arrow/io/memory.h"
-#include "arrow/io/test-common.h"
 #include "arrow/ipc/adapter.h"
-#include "arrow/ipc/file.h"
-#include "arrow/ipc/test-common.h"
-#include "arrow/ipc/util.h"
-
 #include "arrow/test-util.h"
-#include "arrow/types/list.h"
-#include "arrow/types/primitive.h"
-#include "arrow/types/string.h"
-#include "arrow/types/struct.h"
-#include "arrow/util/bit-util.h"
-#include "arrow/util/buffer.h"
 #include "arrow/util/memory-pool.h"
 #include "arrow/util/status.h"
 
@@ -50,10 +44,33 @@ class TestJsonSchemaWriter : public ::testing::Test {
   void TearDown() {}
 
   void TestRoundTrip(const Schema& schema) {
+    rj::StringBuffer sb;
+    rj::Writer<rj::StringBuffer> writer(sb);
+
+    ASSERT_OK(WriteJsonSchema(schema, &writer));
 
+    rj::Document d;
+    d.Parse(sb.GetString());
 
+    std::shared_ptr<Schema> out;
+    ASSERT_OK(ReadJsonSchema(d, &out));
+
+    ASSERT_TRUE(schema.Equals(out));
   }
 };
 
+TEST_F(TestJsonSchemaWriter, FlatTypes) {
+  std::vector<std::shared_ptr<Field>> fields = {
+      field("f0", int8()), field("f1", int16(), false), field("f2", int32()),
+      field("f3", int64(), false), field("f4", uint8()), field("f5", uint16()),
+      field("f6", uint32()), field("f7", uint64()), field("f8", float32()),
+      field("f9", float64()), field("f10", utf8()), field("f11", binary()),
+      field("f12", list(int32())), field("f13", struct_({field("s1", int32()),
+                field("s2", utf8())}))};
+
+  Schema schema(fields);
+  TestRoundTrip(schema);
+}
+
 }  // namespace ipc
 }  // namespace arrow