Moved soa subdirectories elsewhere

mldbai · Apr 2, 2018 · 8c42ebc · 8c42ebc
1 parent 4afc3f1
commit 8c42ebc
Show file tree

Hide file tree

Showing 47 changed files with 90 additions and 60 deletions.
diff --git a/soa/credentials/credential_provider.cc → credentials/credential_provider.cc b/soa/credentials/credential_provider.cc → credentials/credential_provider.cc
@@ -7,7 +7,7 @@
    Basic functionality to get credentials.
 */
 
-#include "credential_provider.h"
+#include "mldb/credentials/credential_provider.h"
 #include "mldb/types/optional.h"
 #include "mldb/base/exc_assert.h"
 #include <mutex>

diff --git a/soa/credentials/credential_provider.h → credentials/credential_provider.h b/soa/credentials/credential_provider.h → credentials/credential_provider.h
@@ -7,7 +7,7 @@
    Credential provider structure and registration.
 */
 
-#include "mldb/soa/credentials/credentials.h"
+#include "mldb/credentials/credentials.h"
 
 #pragma once
 

diff --git a/soa/credentials/credentials.cc → credentials/credentials.cc b/soa/credentials/credentials.cc → credentials/credentials.cc
@@ -6,7 +6,7 @@
 
 */
 
-#include "credentials.h"
+#include "mldb/credentials/credentials.h"
 #include "mldb/types/structure_description.h"
 
 using namespace std;

diff --git a/soa/credentials/credentials.h → credentials/credentials.h b/soa/credentials/credentials.h → credentials/credentials.h
diff --git a/soa/credentials/credentials.mk → credentials/credentials.mk b/soa/credentials/credentials.mk → credentials/credentials.mk
diff --git a/mldb.mk b/mldb.mk
@@ -8,9 +8,9 @@ MLDB_SUBDIRS := \
 	logging \
 	io \
 	http \
+	credentials \
 	vfs \
 	jml \
-	soa \
 	ml \
 	vfs_handlers \
 	utils \

diff --git a/postgresql/postgresql_plugin.cc b/postgresql/postgresql_plugin.cc
@@ -7,7 +7,7 @@
 #include "mldb/core/procedure.h"
 #include "mldb/core/function.h"
 #include "mldb/core/dataset.h"
-#include "mldb/soa/credentials/credentials.h"
+#include "mldb/credentials/credentials.h"
 #include "mldb/types/structure_description.h"
 #include "mldb/types/any_impl.h"
 

diff --git a/soa/service/README.md → rest/README.md b/soa/service/README.md → rest/README.md
diff --git a/soa/service/event_service.cc → rest/event_service.cc b/soa/service/event_service.cc → rest/event_service.cc
@@ -8,7 +8,7 @@
 */
 
 #include "event_service.h"
-#include "multi_aggregator.h"
+//#include "multi_aggregator.h"
 #include <iostream>
 #include "mldb/arch/demangle.h"
 #include "mldb/base/exc_assert.h"
@@ -60,13 +60,13 @@ get(std::ostream & output) const {
     return result;
 }
 
+
 /*****************************************************************************/
 /* NULL EVENT SERVICE                                                        */
 /*****************************************************************************/
 
 NullEventService::
 NullEventService()
-    : stats(new MultiAggregator())
 {
 }
 
@@ -83,15 +83,48 @@ onEvent(const std::string & name,
         float value,
         std::initializer_list<int>)
 {
-    stats->record(name + "." + event, type, value);
 }
 
 void
 NullEventService::
 dump(std::ostream & stream) const
+{
+}
+
+#if 0
+/*****************************************************************************/
+/* AGGREGATOR EVENT SERVICE                                                  */
+/*****************************************************************************/
+
+AggregatorEventService::
+AggregatorEventService()
+    : stats(new MultiAggregator())
+{
+}
+
+AggregatorEventService::
+~AggregatorEventService()
+{
+}
+
+void
+AggregatorEventService::
+onEvent(const std::string & name,
+        const char * event,
+        EventType type,
+        float value,
+        std::initializer_list<int>)
+{
+    stats->record(name + "." + event, type, value);
+}
+
+void
+AggregatorEventService::
+dump(std::ostream & stream) const
 {
     stats->dumpSync(stream);
 }
+#endif
 
 
 /*****************************************************************************/

diff --git a/soa/service/event_service.h → rest/event_service.h b/soa/service/event_service.h → rest/event_service.h
@@ -1,15 +1,14 @@
-// This file is part of MLDB. Copyright 2015 mldb.ai inc. All rights reserved.
-
 /* event_service.h                                                 -*- C++ -*-
    Jeremy Barnes, 12 December 2014
    Copyright (c) 2014 mldb.ai inc.  All rights reserved.
+   This file is part of MLDB. Copyright 2015 mldb.ai inc. All rights reserved.
 
    Service for high frequency logging of events.
 */
 
 #pragma once
 
-#include "mldb/soa/service/stats_events.h"
+#include "stats_events.h"
 #include "mldb/arch/format.h"
 #include <map>
 #include <string>
@@ -62,10 +61,30 @@ struct NullEventService : public EventService {
                          std::initializer_list<int> extra = DefaultOutcomePercentiles);
 
     virtual void dump(std::ostream & stream) const;
+};
+
+
+ #if 0
+/*****************************************************************************/
+/* AGGREGATOR EVENT SERVICE                                                  */
+/*****************************************************************************/
+
+struct AggregatorEventService : public EventService {
+
+    AggregatorEventService();
+    ~AggregatorEventService();
+
+    virtual void onEvent(const std::string & name,
+                         const char * event,
+                         EventType type,
+                         float value,
+                         std::initializer_list<int> extra = DefaultOutcomePercentiles);
+
+    virtual void dump(std::ostream & stream) const;
 
     std::unique_ptr<MultiAggregator> stats;
 };
-
+#endif
 
 /*****************************************************************************/
 /* EVENT RECORDER                                                            */

diff --git a/soa/service/connectfd.cc → rest/opstats/connectfd.cc b/soa/service/connectfd.cc → rest/opstats/connectfd.cc
@@ -10,7 +10,6 @@
 
 #include <netdb.h>
 #include <string.h>
-#include "mldb/soa/service/connectfd.h"
 #include "mldb/arch/exception.h"
 #include <unistd.h>
 

diff --git a/soa/service/connectfd.h → rest/opstats/connectfd.h b/soa/service/connectfd.h → rest/opstats/connectfd.h
diff --git a/soa/service/loop_monitor.cc → rest/opstats/loop_monitor.cc b/soa/service/loop_monitor.cc → rest/opstats/loop_monitor.cc
diff --git a/soa/service/multi_aggregator.cc → rest/opstats/multi_aggregator.cc b/soa/service/multi_aggregator.cc → rest/opstats/multi_aggregator.cc
diff --git a/soa/service/multi_aggregator.h → rest/opstats/multi_aggregator.h b/soa/service/multi_aggregator.h → rest/opstats/multi_aggregator.h
@@ -12,7 +12,7 @@
 #include <mutex>
 #include <thread>
 #include <condition_variable>
-#include "mldb/soa/service/stat_aggregator.h"
+#include "stat_aggregator.h"
 #include "mldb/arch/thread_specific.h"
 #include <iostream>
 

diff --git a/soa/service/service.mk → rest/opstats/opstats.mk b/soa/service/service.mk → rest/opstats/opstats.mk
@@ -16,16 +16,3 @@ LIBOPSTATS_LINK := \
 
 $(eval $(call library,opstats,$(LIBOPSTATS_SOURCES),$(LIBOPSTATS_LINK)))
 
-
-
-# Services
-
-LIBSERVICES_SOURCES := \
-	event_service.cc \
-
-LIBSERVICES_LINK := opstats
-
-$(eval $(call library,services,$(LIBSERVICES_SOURCES),$(LIBSERVICES_LINK)))
-
-
-$(eval $(call include_sub_make,service_testing,testing,service_testing.mk))
diff --git a/soa/service/process_stats.cc → rest/opstats/process_stats.cc b/soa/service/process_stats.cc → rest/opstats/process_stats.cc
@@ -8,7 +8,7 @@
 */
 
 
-#include "mldb/soa/service/process_stats.h"
+#include "process_stats.h"
 #include "mldb/arch/exception.h"
 
 #include <boost/algorithm/string/split.hpp>

diff --git a/soa/service/process_stats.h → rest/opstats/process_stats.h b/soa/service/process_stats.h → rest/opstats/process_stats.h
diff --git a/soa/service/rusage.h → rest/opstats/rusage.h b/soa/service/rusage.h → rest/opstats/rusage.h
diff --git a/soa/service/stat_aggregator.cc → rest/opstats/stat_aggregator.cc b/soa/service/stat_aggregator.cc → rest/opstats/stat_aggregator.cc
@@ -5,7 +5,7 @@
    This file is part of MLDB. Copyright 2015 mldb.ai inc. All rights reserved.
 */
 
-#include "mldb/soa/service/stat_aggregator.h"
+#include "mldb/rest/opstats/stat_aggregator.h"
 #include "mldb/arch/exception.h"
 #include "mldb/arch/format.h"
 #include <iostream>

diff --git a/soa/service/stat_aggregator.h → rest/opstats/stat_aggregator.h b/soa/service/stat_aggregator.h → rest/opstats/stat_aggregator.h
@@ -11,7 +11,7 @@
 
 #include "mldb/jml/stats/distribution.h"
 #include "mldb/types/date.h"
-#include "stats_events.h"
+#include "mldb/rest/stats_events.h"
 #include <unordered_map>
 #include <map>
 #include <deque>

diff --git a/soa/service/statsd_connector.cc → rest/opstats/statsd_connector.cc b/soa/service/statsd_connector.cc → rest/opstats/statsd_connector.cc
@@ -5,15 +5,15 @@
 
 */
 
-#include "mldb/soa/service/statsd_connector.h"
+#include "mldb/rest/opstats/statsd_connector.h"
 #include "mldb/arch/exception.h"
 #include "mldb/arch/format.h"
 #include <iostream>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <string.h>
-#include "mldb/soa/service/connectfd.h"
+#include "connectfd.h"
 #include <unistd.h>
 
 

diff --git a/soa/service/statsd_connector.h → rest/opstats/statsd_connector.h b/soa/service/statsd_connector.h → rest/opstats/statsd_connector.h
@@ -1,7 +1,6 @@
-// This file is part of MLDB. Copyright 2015 mldb.ai inc. All rights reserved.
-
 /* statsd_connector.h                                              -*- C++ -*-
    Send messages to statsd.
+   This file is part of MLDB. Copyright 2015 mldb.ai inc. All rights reserved.
 */
 
 #pragma once

diff --git a/...esting/endpoint_closed_connection_test.cc → ...esting/endpoint_closed_connection_test.cc b/...esting/endpoint_closed_connection_test.cc → ...esting/endpoint_closed_connection_test.cc
diff --git a/soa/service/testing/endpoint_unit_test.cc → rest/opstats/testing/endpoint_unit_test.cc b/soa/service/testing/endpoint_unit_test.cc → rest/opstats/testing/endpoint_unit_test.cc
diff --git a/soa/service/testing/ping_pong.h → rest/opstats/testing/ping_pong.h b/soa/service/testing/ping_pong.h → rest/opstats/testing/ping_pong.h
diff --git a/soa/service/testing/service_testing.mk → rest/opstats/testing/service_testing.mk b/soa/service/testing/service_testing.mk → rest/opstats/testing/service_testing.mk
diff --git a/soa/service/testing/statsd_connector_test.cc → .../opstats/testing/statsd_connector_test.cc b/soa/service/testing/statsd_connector_test.cc → .../opstats/testing/statsd_connector_test.cc
diff --git a/...ng/test_active_endpoint_not_responding.cc → ...ng/test_active_endpoint_not_responding.cc b/...ng/test_active_endpoint_not_responding.cc → ...ng/test_active_endpoint_not_responding.cc
diff --git a/...test_active_endpoint_nothing_listening.cc → ...test_active_endpoint_nothing_listening.cc b/...test_active_endpoint_nothing_listening.cc → ...test_active_endpoint_nothing_listening.cc
diff --git a/soa/service/testing/test_connection_error.h → rest/opstats/testing/test_connection_error.h b/soa/service/testing/test_connection_error.h → rest/opstats/testing/test_connection_error.h
diff --git a/...ice/testing/test_endpoint_accept_speed.cc → ...ats/testing/test_endpoint_accept_speed.cc b/...ice/testing/test_endpoint_accept_speed.cc → ...ats/testing/test_endpoint_accept_speed.cc
diff --git a/...testing/test_endpoint_connection_speed.cc → ...testing/test_endpoint_connection_speed.cc b/...testing/test_endpoint_connection_speed.cc → ...testing/test_endpoint_connection_speed.cc
diff --git a/...ervice/testing/test_endpoint_ping_pong.cc → ...pstats/testing/test_endpoint_ping_pong.cc b/...ervice/testing/test_endpoint_ping_pong.cc → ...pstats/testing/test_endpoint_ping_pong.cc
diff --git a/soa/service/testing/testing.mk → rest/opstats/testing/testing.mk b/soa/service/testing/testing.mk → rest/opstats/testing/testing.mk
diff --git a/rest/rest.mk b/rest/rest.mk
@@ -4,6 +4,8 @@
 # Jeremy Barnes, 16 March 2015
 # Copyright (c) 2015 mldb.ai inc.  All rights reserved.
 
+$(eval $(call include_sub_make,opstats))
+
 LIBREST_SOURCES := \
 	rest_request.cc \
 	rest_request_router.cc \
@@ -38,12 +40,13 @@ LIBSERVICE_PEER_SOURCES := \
 	asio_peer_connection.cc \
 	standalone_peer_server.cc \
 	peer_info.cc \
+	event_service.cc
 
 
-$(eval $(call library,rest,$(LIBREST_SOURCES),services log))
+$(eval $(call library,rest,$(LIBREST_SOURCES),arch types utils log))
 $(eval $(call library,link,$(LIBLINK_SOURCES),watch))
-$(eval $(call library,rest_entity,$(LIBREST_ENTITY_SOURCES),services gc link any json_diff))
-$(eval $(call library,service_peer,$(LIBSERVICE_PEER_SOURCES),rest services gc link rest_entity))
+$(eval $(call library,rest_entity,$(LIBREST_ENTITY_SOURCES),gc link any json_diff))
+$(eval $(call library,service_peer,$(LIBSERVICE_PEER_SOURCES),rest gc link rest_entity))
 
 
 $(eval $(call include_sub_make,rest_testing,testing))
diff --git a/soa/service/stats_events.h → rest/stats_events.h b/soa/service/stats_events.h → rest/stats_events.h
@@ -7,8 +7,7 @@
    Different types of stats events.
 */
 
-#ifndef __logger__stats_events_h__
-#define __logger__stats_events_h__
+#pragma once
 
 #include <utility>
 
@@ -27,6 +26,3 @@ static constexpr std::initializer_list<int> DefaultOutcomePercentiles =
 
 } // namespace MLDB
 
-
-
-#endif /* __logger__stats_events_h__ */
diff --git a/server/credential_collection.cc b/server/credential_collection.cc
@@ -11,7 +11,7 @@
 #include "mldb/rest/rest_request_binding.h"
 #include "mldb/types/structure_description.h"
 #include "mldb/types/pointer_description.h"
-#include "mldb/soa/credentials/credential_provider.h"
+#include "mldb/credentials/credential_provider.h"
 #include "mldb/utils/log.h"
 #include "mldb/utils/json_utils.h"
 #include <signal.h>

diff --git a/server/credential_collection.h b/server/credential_collection.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include "mldb/soa/service/event_service.h"
+#include "mldb/rest/event_service.h"
 #include "mldb/rest/rest_request_router.h"
 #include "mldb/rest/rest_service_endpoint.h"
-#include "mldb/soa/credentials/credentials.h"
+#include "mldb/credentials/credentials.h"
 #include "mldb/rest/rest_collection.h"
 #include "mldb/utils/log_fwd.h"
 

diff --git a/server/mldb_runner.cc b/server/mldb_runner.cc
@@ -14,8 +14,8 @@
 #include "mldb/server/credential_collection.h"
 #include "mldb/vfs/filter_streams.h"
 #include "mldb/utils/config.h"
-#include "mldb/soa/credentials/credential_provider.h"
-#include "mldb/soa/credentials/credentials.h"
+#include "mldb/credentials/credential_provider.h"
+#include "mldb/credentials/credentials.h"
 #include <boost/filesystem.hpp>
 #include <boost/program_options/cmdline.hpp>
 #include <boost/program_options/options_description.hpp>

diff --git a/server/mldb_server.h b/server/mldb_server.h
@@ -12,7 +12,7 @@
 #include "mldb/rest/service_peer.h"
 #include "mldb/rest/in_process_rest_connection.h"
 #include "mldb/types/string.h"
-#include "mldb/soa/service/event_service.h"
+#include "mldb/rest/event_service.h"
 #include "mldb/utils/log_fwd.h"
 
 

diff --git a/soa/soa.mk b/soa/soa.mk
diff --git a/testing/MLDB-1468-credentials-test.py b/testing/MLDB-1468-credentials-test.py
@@ -97,7 +97,7 @@ def test_selection_of_creds_2(self):
         with open(join(expanduser('~'), '.cloud_credentials')) as f:
             creds = f.readlines()
             for idx, cred in enumerate(creds):
-                type, version, key, secret = cred.split('\t')
+                type, version, key, secret,_,_,_,_ = cred.split('\t')
 
                 # store the credential for a specific path
                 resp = mldb.put("/v1/credentials/testcred" + str(idx), {

diff --git a/testing/credentials_persistence_test.cc b/testing/credentials_persistence_test.cc
@@ -13,7 +13,7 @@
 #include "mldb/rest/collection_config_store.h"
 #include "mldb/utils/runner.h"
 #include "mldb/io/message_loop.h"
-#include "mldb/soa/credentials/credentials.h"
+#include "mldb/credentials/credentials.h"
 #include "mldb/vfs/filter_streams.h"
 #include "mldb/http/http_rest_proxy.h"
 #include <boost/algorithm/string.hpp>

diff --git a/vfs_handlers/aws/s3.cc b/vfs_handlers/aws/s3.cc
@@ -15,8 +15,8 @@
 #include "mldb/io/legacy_event_loop.h"
 #include "mldb/io/message_loop.h"
 #include "mldb/jml/utils/file_functions.h"
-#include "mldb/soa/credentials/credentials.h"
-#include "mldb/soa/credentials/credential_provider.h"
+#include "mldb/credentials/credentials.h"
+#include "mldb/credentials/credential_provider.h"
 #include "mldb/utils/testing/print_utils.h"
 #include "mldb/vfs_handlers/aws/xml_helpers.h"
 #include "mldb/types/structure_description.h"

diff --git a/vfs_handlers/azure_blob_storage.cc b/vfs_handlers/azure_blob_storage.cc
@@ -14,7 +14,7 @@
 #include "mldb/arch/format.h"
 #include "mldb/base/exc_assert.h"
 #include "mldb/jml/utils/string_functions.h"
-#include "mldb/soa/credentials/credential_provider.h"
+#include "mldb/credentials/credential_provider.h"
 #include "mldb/types/date.h"
 #include "mldb/vfs/filter_streams.h"
 #include "mldb/vfs/filter_streams_registry.h"

diff --git a/vfs_handlers/sftp.cc b/vfs_handlers/sftp.cc
@@ -25,7 +25,7 @@
 #include "mldb/vfs/filter_streams_registry.h"
 #include "mldb/vfs/fs_utils.h"
 #include "mldb/base/exc_assert.h"
-#include "mldb/soa/credentials/credential_provider.h"
+#include "mldb/credentials/credential_provider.h"
 #include <thread>
 #include <unordered_map>